合并分支 'li' 到 'master'

Li



查看合并请求 !9

@@ -16,7 +16,7 @@ class SmsController extends HomeBaseController
     {
         require_once EXTEND_PATH . '/zt_sms/sms.php';
         $mobile = request()->param('mobile');
-        $code = rand(000000, 999999);
+        $code = rand(100000, 999999);
         $content = '【天生红】您的验证码为' . $code . '，有效期5分钟，请及时使用。';
         $sms = new \SendMsg($mobile, $content);
         $sms->sendSMS();
@@ -68,4 +68,5 @@ class SmsController extends HomeBaseController
             }
         }
     }
+
 }
\ No newline at end of file

@@ -190,10 +190,35 @@ class CenterController extends HomeBaseController
     {
         $order = new OrderModel;
         $data = $order->getAllOrders();
-        print_R($data);exit();
         return $this->fetch('order_list', [
             'data' => $data
         ]);
     }
 
+    public function evaluate()
+    {
+        $request = request();
+        $oid = $request->param('oid');
+        if ($request->isAjax()) {
+            $res = Db::name('zj_order_goods')->field('gid')->where(['oid' => $oid])->select();
+            $data = [];
+            foreach ($res as $key => $item) {
+                $data[$key] = [
+                    'oid' => $oid,
+                    'gid' => $item['gid'],
+                    'uid' => session('user.id'),
+                    'is_sta' => 1,
+                    'is_shove' => 1,
+                    'create_time' => time(),
+                    'rank' => $request->param('rank')
+                ];
+            }
+            if (Db::name('zj_evaluate')->insertAll($data)) {
+                $this->success('评价成功', '', true);
+            }
+        } else {
+            return $this->fetch();
+        }
+    }
+
 }
\ No newline at end of file

@@ -10,7 +10,7 @@
 // [ 入口文件 ]
 
 // 调试模式开关
-define("APP_DEBUG", true);
+define("APP_DEBUG", false);
 
 // 定义CMF根目录,可更改此目录
 define('CMF_ROOT', __DIR__ . '/../');

@@ -121,14 +121,19 @@
 <script>
     $(".sendcode").click(function () {
         var mobile = $(".enterphone").val();
-        $.ajax({
-            url:"{:url('sms/Sms/sendSms')}",
-            data:{
-                mobile:mobile
-            },
-            type:"POST",
-            dataType:"JSON",
-        })
+        var pattern = /^1[34578]\d{9}$/;
+        if(pattern.test(mobile)) {
+            $.ajax({
+                url: "{:url('sms/Sms/sendSms')}",
+                data: {
+                    mobile: mobile
+                },
+                type: "POST",
+                dataType: "JSON",
+            })
+        } else {
+            alert('请输入正确的手机号');
+        }
     })
 
     $(".nextstep").click(function(){
@@ -160,5 +165,35 @@
             }
         }
     })
+
+    var InterValObj; //timer变量，控制时间
+    var count = 60; //间隔函数，1秒执行
+    var curCount;//当前剩余秒数
+
+    $(".sendcode").click(function(){
+        curCount = count;
+        //设置button效果，开始计时
+        $(".sendcode").attr("disabled",true);
+
+        // $(".sendcode").unbind()
+        $(".sendcode").html( curCount + "秒");
+        InterValObj = window.setInterval(SetRemainTime, 1000); //启动计时器，1秒执行一次
+
+
+    });
+
+    //timer处理函数
+    function SetRemainTime() {
+        if (curCount == 0) {
+            window.clearInterval(InterValObj);//停止计时器
+            $(".sendcode").removeAttr("disabled");//启用按钮
+
+            $(".sendcode").html("重新发送验证码");
+        }
+        else {
+            curCount--;
+            $(".sendcode").html(curCount + "秒");
+        }
+    }
 </script>
 </html>

@@ -121,14 +121,19 @@
 <script>
     $(".sendcode").click(function () {
         var mobile = $(".enterphone").val();
-        $.ajax({
-            url:"{:url('sms/Sms/sendSms')}",
-            data:{
-                mobile:mobile
-            },
-            type:"POST",
-            dataType:"JSON",
-        })
+        var pattern = /^1[34578]\d{9}$/;
+        if(pattern.test(mobile)) {
+            $.ajax({
+                url: "{:url('sms/Sms/sendSms')}",
+                data: {
+                    mobile: mobile
+                },
+                type: "POST",
+                dataType: "JSON",
+            })
+        }else {
+            alert('请输入正确的手机号');
+        }
     })
 
     $(".nextstep").click(function(){

+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+    <link rel="stylesheet" href="https://at.alicdn.com/t/font_834805_0ml90wdq5hzm.css">
+    <link rel="stylesheet" href="__INDEX__/css/base.css">
+    <link rel="stylesheet" href="__INDEX__/css/swiper.min.css">
+    <script type="text/javascript" src="__INDEX__/js/base.js"></script>
+    <title>写评价</title>
+    <style>
+        body,html{
+            width:100%;
+            height:100%;
+            background: #fff;
+        }
+        .evalute_rank{
+
+            height:1.6rem;
+            display:flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 0.38rem 1.63rem;
+        }
+        .rank_type_img{
+            font-size: 0;
+            width:0.6rem;
+            height:0.72rem;
+        }
+        .rank_type_img img{
+            width:100%;
+        }
+        .evalute_text{
+            width:0.6rem;
+            text-align: center;
+            font-size: 0.24rem;
+            color:#CCCCCC;
+        }
+        .active{
+            width:0.6rem;
+            text-align: center;
+            font-size: 0.24rem;
+            color:#FE0A01;
+        }
+        .writevalute{
+            width:6.86rem;
+            height:3.6rem;
+            background:#EBEBEB;
+            border-radius: 0.1rem;
+            margin: 0 auto;
+            padding: 0.31rem 0.3rem;
+        }
+        #write_evalute{
+            width:6.25rem;
+            height:3rem;
+            border:none;
+            outline:none;
+            background: #EBEBEB;
+            color:#999999;
+            font-size: 0.28rem;
+        }
+        .photo{
+            display:flex;
+            padding: 0.24rem 0.32rem;
+        }
+        .enter_photo{
+            width:1.8rem;
+            height:1.8rem;
+        }
+        .addphoto{
+            width:1.6rem;
+            height:1.6rem;
+            margin-top:0.1rem;
+            margin-left: 0.24rem;
+        }
+        .enter_photo img,.addphoto img{
+            width:100%;
+        }
+        .publish{
+            width:6.86rem;
+            height:0.88rem;
+            text-align: center;
+            line-height: 0.88rem;
+            background:#FE0A01;
+            color:#fff;
+            font-size:0.32rem;
+            position:fixed;
+            bottom:0.55rem;
+            left:0;
+            right:0;
+            margin:0 auto;
+            box-shadow:0px 15px 30px 0px rgba(254,10,1,0.24);
+            border-radius: 0.44rem;
+        }
+    </style>
+</head>
+<body>
+<div class="container">
+    <div class="evalute_rank">
+        <div class="rank_type">
+            <p class="rank_type_img">
+                <img src="__INDEX__/img/rank1red.png" alt="">
+            </p>
+            <p class="evalute_text active">好评</p>
+
+        </div>
+        <div class="rank_type">
+            <p class="rank_type_img">
+                <img src="__INDEX__/img/rank2gray.png" alt="">
+            </p>
+            <p class="evalute_text">中评</p>
+
+        </div>
+        <div class="rank_type">
+            <p class="rank_type_img">
+                <img src="__INDEX__/img/rank3gray.png" alt="">
+            </p>
+            <p class="evalute_text">差评</p>
+
+        </div>
+    </div>
+    <div class="writevalute">
+        <textarea name="" id="write_evalute" cols="30" rows="10" placeholder="请写下您的评价"></textarea>
+    </div>
+    <div class="photo">
+        <div style="display:flex">
+            <p class="enter_photo">
+                <img src="__INDEX__/img/apic01.png" alt="">
+            </p>
+
+        </div>
+        <div class="addphoto">
+            <!--__INDEX__/img/addimg.png-->
+            <div id="preview">
+                <img id="imghead" border="0" src="__INDEX__/img/tianjia@2x.png" style="width:100%;height:100%" onclick="$('#previewImg').click();">
+            </div>
+            <!--<img src="__INDEX__/img/delet.png" alt="" style="position:absolute;bottom:92px;left:46px" class="deleteimg"/>-->
+            <input type="file" onchange="previewImage(this)" style="display: none;" id="previewImg">
+        </div>
+        <!--<p class="addphoto">-->
+        <!--<img src="__INDEX__/img/tianjia@2x.png" alt="">-->
+        <!--</p>-->
+    </div>
+    <div class="publish">
+        发表
+    </div>
+</div>
+</body>
+<script src="__INDEX__/js/jquery.min.js"></script>
+<script>
+    function clacImgZoomParam(maxWidth, maxHeight, width, height) {
+        var param = {
+            top: 0,
+            left: 0,
+            width: width,
+            height: height
+        };
+        if(width > maxWidth || height > maxHeight) {
+            rateWidth = width / maxWidth;
+            rateHeight = height / maxHeight;
+
+            if(rateWidth > rateHeight) {
+                param.width = maxWidth;
+                param.height = Math.round(height / rateWidth);
+            } else {
+                param.width = Math.round(width / rateHeight);
+                param.height = maxHeight;
+            }
+        }
+        param.left = Math.round((maxWidth - param.width) / 2);
+        param.top = Math.round((maxHeight - param.height) / 2);
+        return param;
+    }
+
+
+    function previewImage(file) {
+        var MAXWIDTH =60;
+        var MAXHEIGHT =77;
+        var div = document.getElementById('preview');
+        if(file.files && file.files[0]) {
+            div.innerHTML = '<img id=imghead onclick=$("#previewImg").click()>';
+            var img = document.getElementById('imghead');
+            img.onload = function() {
+                var rect = clacImgZoomParam(MAXWIDTH, MAXHEIGHT, img.offsetWidth, img.offsetHeight);
+                img.width = rect.width;
+                img.height = rect.height;
+                //                 img.style.marginLeft = rect.left+'px';
+                img.style.marginTop = rect.top + 'px';
+            }
+            var reader = new FileReader();
+            reader.onload = function(evt) {
+                img.src = evt.target.result;
+            }
+            reader.readAsDataURL(file.files[0]);
+        } else //兼容IE
+        {
+            var sFilter = 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale,src="';
+            file.select();
+            var src = document.selection.createRange().text;
+            div.innerHTML = '<img id=imghead>';
+            var img = document.getElementById('imghead');
+            img.filters.item('DXImageTransform.Microsoft.AlphaImageLoader').src = src;
+            var rect = clacImgZoomParam(MAXWIDTH, MAXHEIGHT, img.offsetWidth, img.offsetHeight);
+            status = ('rect:' + rect.top + ',' + rect.left + ',' + rect.width + ',' + rect.height);
+            div.innerHTML = "<div id=divhead style='width:" + rect.width + "px;height:" + rect.height + "px;margin-top:" + rect.top + "px;" + sFilter + src + "\"'></div>";
+        }
+        // var formData = new FormData();
+        // var fileM = document.querySelector("#previewImg");
+        // var fileObj = fileM.files[0];
+        // formData.append("files", fileObj);
+        // $.ajax({
+        //     url: 'http://hula.wx.bronet.cn/index.php/MyComment/upload',
+        //     type: 'POST',
+        //     data: formData,
+        //     async: false,
+        //     cache: false,
+        //     contentType: false,
+        //     processData: false,
+        //     success: function(res) {
+        //         console.log(res);
+        //         pic = res.data;
+        //         console.log(pic);
+        //         imgurl.push(pic);
+        //         console.log(imgurl)
+        //         var text = '';
+        //         text += '<div class="evaluate_pic_item" style="float:left">' +
+        //             '<img src="' + pic + '" class="delimg"/>' +
+        //             '<div class="icon">' +
+        //             '<img src="__INDEX__/img/10拷贝2@2x_59.png" />' +
+        //             '</div>' +
+        //             '</div>'
+        //         $(".addimg").append(text);
+        //         if(imgurl.length == 3) {
+        //             $(".imgone").css("display", "none");
+        //         }
+        //         $("#imghead").attr("src","__INDEX__/img/3@2x.png");
+        //     },
+        //     error: function() {
+        //
+        //     }
+        // });
+    }
+</script>
+</html>

-
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -50,441 +49,207 @@
     </div>
     <!--全部订单-->
     <div class="orderlist allorder">
-        <!--代付款-->
+        <volist name="data.all" id="vo">
         <div class="item_order_list">
             <div class="order_head">
                 <div class="order_num">
                     <p class="order_list_num">订单号:</p>
-                    <p class="item_num">201807122659</p>
+                    <p class="item_num">{$vo.order_num}</p>
                 </div>
                 <p class="order_type">待付款</p>
             </div>
             <div class="order_content">
+                <volist name="vo.detail" id="v">
                 <div class="order_content_item">
                     <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
-                </div>
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
+                        <img src="{$v.thumb}" alt="">
                     </p>
                     <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
+                        <p class="good_name">{$v.name}</p>
                         <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
+                            <p class="item_tast">{$v.intro}</p>
+                            <p class="tast_num">x{$v.num}</p>
                         </div>
                         <p class="item_price">
                             ￥
-                            <span class="item_money">30</span>
+                            <span class="item_money">{$v.price}</span>
                         </p>
                     </div>
                 </div>
+                </volist>
             </div>
-            <div class="unpay">
-                <p class="pay">付款</p>
-                <p class="cancelorder cancellist">取消订单</p>
-
-            </div>
-        </div>
-        <!--待发货-->
-        <div class="item_order_list">
-            <div class="order_head">
-                <div class="order_num">
-                    <p class="order_list_num">订单号:</p>
-                    <p class="item_num">201807122659</p>
+            <if condition="$vo['step'] eq '1'">
+                <div class="unpay">
+                    <p class="pay">付款</p>
+                    <p class="cancelorder cancellist">取消订单</p>
                 </div>
-                <p class="order_type">待发货</p>
-            </div>
-            <div class="order_content">
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
+            </if>
+            <if condition="$vo['step'] eq '3'">
+                <div class="unpay">
+                    <p class="pay">确认收货</p>
                 </div>
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
+            </if>
+            <if condition="$vo['step'] eq '5'">
+                <div class="unpay">
+                    <p class="pay eval" data-url="{:url('user/Center/evaluate',['oid'=>$vo['id']])}">评价</p>
+                    <p class="cancelorder refund">申请退款</p>
                 </div>
-            </div>
-
+            </if>
         </div>
-        <!--待收货-->
-        <div class="item_order_list">
-            <div class="order_head">
-                <div class="order_num">
-                    <p class="order_list_num">订单号:</p>
-                    <p class="item_num">201807122659</p>
-                </div>
-                <p class="order_type">待收货</p>
-            </div>
-            <div class="order_content">
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
-                </div>
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
-                </div>
-            </div>
-            <div class="unpay">
-                <p class="pay">确认收货</p>
+        </volist>
+    </div>
+
 
-            </div>
-        </div>
-        <!--已完成-->
-        <div class="item_order_list drawback">
-            <div class="order_head">
-                <div class="order_num">
-                    <p class="order_list_num">订单号:</p>
-                    <p class="item_num">201807122659</p>
-                </div>
-                <p class="order_type">已完成</p>
-            </div>
-            <div class="order_content">
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
-                </div>
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
-                </div>
-            </div>
-            <div class="unpay">
-                <p class="pay eval">评价</p>
-                <p class="cancelorder refund">申请退款</p>
 
-            </div>
-        </div>
-        <!--待退货-->
-        <div class="item_order_list">
-            <div class="order_head">
-                <div class="order_num">
-                    <p class="order_list_num">订单号:</p>
-                    <p class="item_num">201807122659</p>
-                </div>
-                <p class="order_type">待发货</p>
-            </div>
-            <div class="order_content">
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
-                </div>
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
-                </div>
-            </div>
 
-        </div>
-    </div>
     <!--待支付-->
     <div class="orderlist waitpay" style="display:none">
+        <volist name="data.unpaid" id="vo">
         <div class="item_order_list">
             <div class="order_head">
                 <div class="order_num">
                     <p class="order_list_num">订单号:</p>
-                    <p class="item_num">201807122659</p>
+                    <p class="item_num">{$vo.order_num}</p>
                 </div>
                 <p class="order_type">待付款</p>
             </div>
             <div class="order_content">
+                <volist name="vo.detail" id="v">
                 <div class="order_content_item">
                     <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
-                </div>
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
+                        <img src="{$v.thumb}" alt="">
                     </p>
                     <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
+                        <p class="good_name">{$v.name}</p>
                         <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
+                            <p class="item_tast">{$v.intro}</p>
+                            <p class="tast_num">x{$v.num}</p>
                         </div>
                         <p class="item_price">
                             ￥
-                            <span class="item_money">30</span>
+                            <span class="item_money">{$v.price}</span>
                         </p>
                     </div>
                 </div>
+                </volist>
             </div>
             <div class="unpay">
                 <p class="pay">付款</p>
                 <p class="cancelorder cancellist">取消订单</p>
-
             </div>
         </div>
+        </volist>
     </div>
     <!--待发货-->
     <div class="orderlist waitsend" style="display:none">
+        <volist name="data.undelivered" id="vo">
         <div class="item_order_list">
             <div class="order_head">
                 <div class="order_num">
                     <p class="order_list_num">订单号:</p>
-                    <p class="item_num">201807122659</p>
+                    <p class="item_num">{$vo.order_num}</p>
                 </div>
                 <p class="order_type">待发货</p>
             </div>
             <div class="order_content">
+                <volist name="vo.detail" id="v">
                 <div class="order_content_item">
                     <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
-                </div>
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
+                        <img src="{$v.thumb}" alt="">
                     </p>
                     <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
+                        <p class="good_name">{$v.name}</p>
                         <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
+                            <p class="item_tast">{$v.intro}</p>
+                            <p class="tast_num">x{$v.num}</p>
                         </div>
                         <p class="item_price">
                             ￥
-                            <span class="item_money">30</span>
+                            <span class="item_money">{$v.price}</span>
                         </p>
                     </div>
                 </div>
+                </volist>
             </div>
-
         </div>
+        </volist>
     </div>
     <!--待收货-->
     <div class="orderlist waittake" style="display:none">
+        <volist name="data.unreceived" id="vo">
         <div class="item_order_list">
             <div class="order_head">
                 <div class="order_num">
                     <p class="order_list_num">订单号:</p>
-                    <p class="item_num">201807122659</p>
+                    <p class="item_num">{$vo.order_num}</p>
                 </div>
                 <p class="order_type">待收货</p>
             </div>
             <div class="order_content">
+                <volist name="vo.detail" id="v">
                 <div class="order_content_item">
                     <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
-                </div>
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
+                        <img src="{$v.thumb}" alt="">
                     </p>
                     <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
+                        <p class="good_name">{$v.name}</p>
                         <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
+                            <p class="item_tast">{$v.intro}</p>
+                            <p class="tast_num">x{$v.num}</p>
                         </div>
                         <p class="item_price">
                             ￥
-                            <span class="item_money">30</span>
+                            <span class="item_money">{$v.price}</span>
                         </p>
                     </div>
                 </div>
+                </volist>
             </div>
             <div class="unpay">
                 <p class="pay">确认收货</p>
 
             </div>
         </div>
+        </volist>
     </div>
     <!--已完成-->
     <div class="orderlist finish drawback" style="display:none">
+        <volist name="data.completed" id="vo">
         <div class="item_order_list">
             <div class="order_head">
                 <div class="order_num">
                     <p class="order_list_num">订单号:</p>
-                    <p class="item_num">201807122659</p>
+                    <p class="item_num">{$vo.order_num}</p>
                 </div>
                 <p class="order_type">已完成</p>
             </div>
             <div class="order_content">
+                <volist name="vo.detail" id="vo">
                 <div class="order_content_item">
                     <p class="content_item_img">
                         <img src="__INDEX__/img/apic01.png" alt="">
                     </p>
                     <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
-                        <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
-                        </div>
-                        <p class="item_price">
-                            ￥
-                            <span class="item_money">30</span>
-                        </p>
-                    </div>
-                </div>
-                <div class="order_content_item">
-                    <p class="content_item_img">
-                        <img src="__INDEX__/img/apic01.png" alt="">
-                    </p>
-                    <div class="content_text">
-                        <p class="good_name">百草味 肉干肉脯百草味 肉干肉脯 白芝麻猪肉脯</p>
+                        <p class="good_name">{$v.name}</p>
                         <div class="good_test">
-                            <p class="item_tast">奶油味夏威夷果</p>
-                            <p class="tast_num">x1</p>
+                            <p class="item_tast">{$v.intro}</p>
+                            <p class="tast_num">x{$v.num}</p>
                         </div>
                         <p class="item_price">
                             ￥
-                            <span class="item_money">30</span>
+                            <span class="item_money">{$v.price}</span>
                         </p>
                     </div>
                 </div>
+                </volist>
             </div>
             <div class="unpay">
-                <p class="pay eval">评价</p>
+                <p class="pay eval" data-url="{:url('user/Center/evaluate',['oid'=>$vo['id']])}">评价</p>
                 <p class="cancelorder refund">申请退款</p>
 
             </div>
         </div>
+        </volist>
     </div>
 </div>
 
@@ -530,11 +295,11 @@
     //评价
     $(".eval").click(function(){
         window.event.stopPropagation()
-        window.location.href='evalute.html'
+        window.location.href=$(this).attr('data-url');
     })
     //退款申请详情页
     $(".drawback").click(function(){
         window.location.href='applicationdetail.html'
     })
 </script>
-</html>
+</html>
\ No newline at end of file