DengTao il y a 8 ans
Parent
commit
e7424572b5

+ 1 - 1
www/protected/controllers/SiteController.php

@@ -80,7 +80,7 @@ class SiteController extends AdminController
 	 * 登录页面
 	 */
 	public function actionLogin()
-	{    
+	{
 		$model = new LoginForm();
 		if (isset($_POST['LoginForm'])){
 			$model->attributes = $_POST['LoginForm'];

+ 15 - 12
www/protected/modules/moonclub/controllers/WebController.php

@@ -13,7 +13,7 @@ class WebController extends MoonClubBaseController {
         if($code && $state){
             $accessInfo = CommonWeixin::getAccessInfo1($code);
             $userId = '';
-            if (!isset($accessInfo['errcode']) && $state == 'xiangyuehui') {
+            if (!isset($accessInfo['errcode']) && $state == 'yiguanjia') {
                 $appToken = md5(substr($accessInfo['openid'],2));
                 //微信校验通过,登录(注册),分发token
                 $userInfo = CommonWeixin::getUserInfo($accessInfo['access_token'], $accessInfo['openid']);
@@ -78,7 +78,13 @@ class WebController extends MoonClubBaseController {
                 'appToken' => $appToken,
             ));
         }else{
-
+            /* var_dump(array(
+                     'version' => '2015111601',
+                     'debug' => 'false',
+                     'signPackage' => $signPackage,
+                     'userId' => $userId,
+                     'appToken' => $appToken,
+             ));exit;*/
             $this->renderpartial('index', array(
                 'version' => '2015111601',
                 'debug' => 'false',
@@ -91,24 +97,21 @@ class WebController extends MoonClubBaseController {
 
     //检查微信登录页
     public function actionWxIndex() {
-        $wxConfig = Yii::app()->params['xyhWxConfig'];
+        $wxConfig = Yii::app()->params['wxConfig'];
         $home_page = Yii::app()->getRequest()->getParam("home_page",'');
-        $redirectURI = 'http://' . $_SERVER['HTTP_HOST'] . Yii::app()->request->baseUrl . 'index.php?r=/moonclub/web/index';
+        $redirectURI = 'http://' . $_SERVER['HTTP_HOST'] . Yii::app()->request->baseUrl . '/o2o/web/index';
         if($home_page){
-            $appURI = Yii::app()->request->baseUrl . 'index.php?r=/moonclub/web/index&home_page='.$home_page;
+            $appURI = Yii::app()->request->baseUrl . '/o2o/web/index'.'&home_page='.$home_page;
             $redirectURI = $redirectURI.'/'.$home_page;
         }else{
-            $appURI = Yii::app()->request->baseUrl . 'index.php?r=/moonclub/web/index';
+            $appURI = Yii::app()->request->baseUrl . '/o2o/web/index';
         }
-        var_dump($appURI);
-
         $scope = 'snsapi_userinfo';
-        $state = 'xiangyuehui';
+        $state = 'yiguanjia';
         $codeURI = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' . $wxConfig['appId'] . '&redirect_uri=' . urlencode($redirectURI) . '&response_type=code&scope=' . $scope . '&state=' . $state . '#wechat_redirect';
-        var_dump($codeURI);
         $this->renderpartial('wxIndex', array(
-              'codeURI' => $codeURI,
-              'appURI' => $appURI
+            'codeURI' => $codeURI,
+            'appURI' => $appURI
         ));
     }
 

+ 0 - 343
www/protected/modules/moonclub/views/commision/index.php

@@ -1,343 +0,0 @@
-<style>
-    .f_label {width: 90px;}
-    .accordion-body {padding: 0;}
-</style>
-<div id="main">
-<div region="west" border="false" id="west_panel">
-    <table id="dg_content"></table>
-    <div id="tb_content">
-        <div class="tb_line">
-            <input id="search" style="120px" />
-            <span class="tb_label">类型: </span>
-            <input id="filter_type" />
-            <span class="tb_label">预约时间: </span>
-            <input id="filter_start" style="100px"/>
-            <span class="tb_label">至</span>
-            <input id="filter_end" style="100px"/>
-            <div class="right">
-                <a href="#" class='easyui-linkbutton' iconCls="icon-add" plain="true" onclick="add();return false;">新增</a>
-                <a href="#" class='easyui-linkbutton' iconCls="icon-search" plain="true" onclick="searchContent();return false;">查询</a>
-            </div>
-        </div>
-    </div>
-</div>
-<div region="center" border="false">
-<div class="easyui-layout detail_layout">
-<div data-options="region:'center'" class="detail_center">
-<div class="detail_main">
-    <form id="content_form">
-        <ul id="content_ul"></ul>
-    </form>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div style="display:none;">
-<div id="add_dialog" style="padding: 15px 0;">
-    <form id="add_form" method="post">
-        <ul>
-            <li class="f_item">
-                <div class="box">
-                    <div class="f_label">
-                        <span>时间:</span>
-                    </div>
-                    <div class="box_flex f_content">
-                        <input id="add_datetime" name="datetime" />
-                    </div>
-                </div>
-            </li>
-            <li class="f_item">
-                <div class="box">
-                    <div class="f_label">
-                        <span>选择保洁师:</span>
-                    </div>
-                    <div class="box_flex f_content">
-                        <input id="add_username" name="user_name" />
-                        <input id="add_userid" name="user" type="hidden" />
-                    </div>
-                </div>
-            </li>
-            <li class="f_item">
-                <div class="box">
-                    <div class="f_label">
-                        <span>订单ID:</span>
-                    </div>
-                    <div class="box_flex f_content">
-                        <input id="add_order" name="order" />
-                    </div>
-                </div>
-            </li>
-            <li class="f_item">
-                <div class="box">
-                    <div class="f_label">
-                        <span>提成数(元):</span>
-                    </div>
-                    <div class="box_flex f_content">
-                        <input id="add_commision" name="commision" />
-                    </div>
-                </div>
-            </li>
-        </ul>
-    </form>
-</div>
-</div>
-<script language="javascript" type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/coolautosuggest/jquery.coolautosuggest.js"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/js/coolautosuggest/jquery.coolautosuggest.css" />
-<script type="text/javascript">
-var jq_dg_content   = $('#dg_content');
-var w_width         = $(window).width();
-var w_height        = $(window).height();
-var jq_content_form = $('#content_form');
-var jq_filter_type  = $('#filter_type');
-var jq_search       = $('#search');
-var jq_filter_start = $('#filter_start');
-var jq_filter_end   = $('#filter_end');
-var jq_add_dialog   = $('#add_dialog');
-var jq_add_form     = $('#add_form');
-var jq_add_datetime = $('#add_datetime');
-var jq_add_username = $('#add_username');
-var type_option = <?php echo json_encode($type_option); ?>
-
-var module_router = site_root + '/index.php?r=o2o/commision';
-
-$(function() {
-    var p_width = parseInt(w_width / 2);
-    if (p_width < 520){
-        p_width = 520;
-    }
-    var d_width = p_width - 10;
-    $('#west_panel').css({width: p_width});
-    $('#main').css({width: w_width-25, height: w_height-18}).layout();
-
-    jq_filter_type.combobox({
-        editable: false,
-        width: 100,
-        data: type_option,
-        onSelect: function() {
-            searchContent();
-        }
-    });
-
-    jq_search.searchbox({
-        width: 150,
-        prompt: '订单ID、姓名、拼音',
-        searcher: function() {
-            searchContent();
-        }
-    });
-
-    jq_filter_start.datebox({
-        width: 100,
-        editable: false
-    });
-
-    jq_filter_end.datebox({
-        width: 100,
-        editable: false
-    });
-
-    jq_add_datetime.datetimebox({
-        showSeconds: false,
-        width: 150,
-        editable: true
-    });
-
-    // 内容表格
-    jq_dg_content.datagrid({
-        url: module_router + '/list',
-        title: '保洁师提成',
-        width: d_width,
-        height: w_height - 18,
-        fitColumns: true,
-        autoRowHeight: true,
-        striped: true,
-        toolbar: '#tb_content',
-        singleSelect: true,
-        selectOnCheck: false,
-        checkOnSelect: false,
-        pagination: true,
-        pageList: [20, 30, 50],
-        pageSize: 20,
-        nowrap: false,
-        idField: 'id',
-        sortName: 'booking_time',
-        sortOrder: 'desc',
-        queryParams: $.extend(get_param_obj(), {}),
-        frozenColumns:[],
-        columns: [
-            [
-                {field: 'id', titie:'id', hidden: true},
-                {field: 'time_str', title: '完成时间', width: 30},
-                {field: 'booking_time', title: '预约时间', width: 30, sortable: true,
-                    formatter: function(value, row, index) {
-                        return row['booking_time_str'];
-                    }
-                },
-                {field: 'user_str', title: '保洁师姓名', width: 25},
-                {field: 'commision', title: '提成数量(元)', width: 25},
-                {field: 'type_str', title: '类型', width: 25},
-                {field: 'order', title: '操作', width: 25,
-                    formatter: function(value, row, index) {
-                        if (row.type == 0) {
-                            var url = '\'<?php echo Yii::app()->request->baseUrl; ?>/index.php?r=rOrder&id='+value+'\'';
-                            return '<a href="javascript:;" onclick="parent.load_url('+url+')">'+'查看订单'+'</a>';
-                        } else if (row.type == 1) {
-                            var url = '\'<?php echo Yii::app()->request->baseUrl; ?>/index.php?r=appendOrders&id='+value+'\'';
-                            return '<a href="javascript:;" onclick="parent.load_url('+url+')">'+'查看订单'+'</a>';
-                        } else {
-                            return '';
-                        }
-                    }
-                }
-            ]
-        ],
-        onSelect: function(index, row) {
-
-        },
-        onLoadSuccess: function() {
-            $('#content_ul').empty();
-            if (jq_search.searchbox('getValue') && jq_filter_start.datebox('getValue') && jq_filter_end.datebox('getValue')) {
-                $.post(
-                    module_router + '/commisionCountOne',
-                    {
-                        search: jq_search.searchbox('getValue'),
-                        start: jq_filter_start.datebox('getValue'),
-                        end: jq_filter_end.datebox('getValue'),
-                        type: jq_filter_type.combobox('getValue')
-                    },
-                    function (res) {
-                        var data = $.parseJSON(res);
-                        for (key in data) {
-                            var _html  = '<li class="f_item"><div class="box"><div class="f_label">';
-                                _html += '<span>' + data[key]['type'] + '</span>';
-                                _html += '</div><div class="box_flex f_content">' + data[key]['sum'] + '</div>';
-                                _html += '</div></li>';
-                            $('#content_ul').append(_html);
-                        }
-                    }
-                );
-            }
-        }
-    });
-
-    // 新增提成表单
-    jq_add_form.form({
-        url: module_router + '/addCommision',
-        onSubmit: function(param) {
-            check = checkAddForm();
-            if (!check) {
-                return false;
-            } else {
-                $.messager.progress();
-            }
-        },
-        success: function(res) {
-            $.messager.progress('close');
-            var res = JSON.parse(res);
-
-            if (res.success){
-                jq_dg_content.datagrid('reload');
-            }
-            if(res.success){
-                $.messager.show({
-                    title: '提示',
-                    msg: '保存成功',
-                    timeout: 3500,
-                    showType: 'slide'
-                });
-                jq_add_dialog.dialog('close');
-            }else{
-                $.messager.show({
-                    title: '提示',
-                    msg: res.message,
-                    timeout: 3500,
-                    showType: 'slide'
-                });
-            }
-        }
-    });
-
-    // 新增提成弹窗
-    jq_add_dialog.dialog({
-        title: '新增提成',
-        width: 400,
-        height: 280,
-        closed: true,
-        modal: true,
-        buttons:[{
-            text: '确认',
-            iconCls: 'icon-ok',
-            handler: function() {
-                jq_add_form.submit();
-            }
-        }, {
-            text: '取消',
-            iconCls: 'icon-cancel',
-            handler: function() {
-                jq_add_dialog.dialog('close');
-            }
-        }],
-        onOpen: function() {
-            jq_add_form.form('clear');
-            $('#suggestions_holder').remove();
-            jq_add_username.coolautosuggest({
-                url: 'index.php?r=material/selectUser&user=',
-                showDescription: true,
-                onSelected: function(result) {
-                    $('#add_userid').val(result.uid);
-                }
-            });
-        }
-    });
-});
-
-function add() {
-    jq_add_dialog.dialog('open');
-}
-
-function searchContent() {
-    var type_search    = jq_filter_type.combobox('getValue');
-    var search_content = jq_search.searchbox('getValue');
-    var filter_start   = jq_filter_start.datebox('getValue');
-    var filter_end     = jq_filter_end.datebox('getValue');
-
-    jq_dg_content.datagrid({
-        pageNum: 1,
-        queryParams: {
-            type: type_search,
-            search: search_content,
-            start: filter_start,
-            end: filter_end
-        }
-    });
-}
-
-function checkAddForm() {
-    var username = $('#add_username').val();
-    if (username.length == 0) {
-        $.messager.alert('提示', '请选择保洁师');
-        return false;
-    }
-
-    // var order = $('#add_order').val();
-    // if (order.length == 0) {
-    //     $.messager.alert('提示', '请输入普通订单/追加订单号');
-    //     return false;
-    // }
-
-    var commision = $('#add_commision').val();
-    if (commision.length == 0) {
-        $.messager.alert('提示', '请输入提成数');
-        return false;
-    }
-
-    var num_reg = new RegExp(/^[-\d]*\d*[\.]*\d*$/);
-    if (!num_reg.test(commision)) {
-        $.messager.alert('提示', '提成只能输入整数或带小数点的数字');
-        return false;
-    }
-
-    return true;
-}
-</script>

+ 0 - 31
www/protected/modules/moonclub/views/layouts/qyindex.php

@@ -1,31 +0,0 @@
-<!DOCTYPE>
-<html>
-<head>
-    <title></title>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0" />
-    <!-- vue 框架 -->
-    <script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qywechat/vue.js"></script>
-    <!-- jquery 框架 -->
-    <script type="text/javascript" src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.js"></script>
-    <!-- amaze 框架 -->
-    <link rel="stylesheet" type="text/css" href="http://cdn.amazeui.org/amazeui/2.5.0/css/amazeui.css">
-    <link rel="stylesheet" type="text/css" href="http://cdn.amazeui.org/amazeui/2.5.0/css/amazeui.min.css">
-    <script type="text/javascript" src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.js"></script>
-    <script type="text/javascript" src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.min.js"></script>
-    <script type="text/javascript" src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.ie8polyfill.js"></script>
-    <script type="text/javascript" src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.ie8polyfill.min.js"></script>
-    <script type="text/javascript" src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.widgets.helper.js"></script>
-    <script type="text/javascript" src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.widgets.helper.min.js"></script>
-    <!-- 自定义样式 -->
-    <link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/css/qywechat/style.css?v=20151215">
-    <!-- 插件 -->
-    <script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qywechat/jquery.vtable.js?v=20151215"></script>
-    <script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qywechat/jquery.valert.js?v=20160106"></script>
-    <script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qywechat/jquery.vloading.js?v=20151215"></script>
-    <script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qywechat/jquery.vselect.js?v=20151215"></script>
-</head>
-<body>
-<?php echo $content; ?>
-</body>
-</html>

+ 0 - 30
www/protected/modules/moonclub/views/layouts/qyinfo.php

@@ -1,30 +0,0 @@
-<!-- 企业号应用详情布局 -->
-<!DOCTYPE>
-<html>
-<head>
-    <title></title>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0" />
-    <!-- vue 框架 -->
-    <script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qywechat/vue.js"></script>
-    <!-- jquery 框架 -->
-    <script type="text/javascript" src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.js"></script>
-    <!-- amaze 框架 -->
-    <link rel="stylesheet" type="text/css" href="http://cdn.amazeui.org/amazeui/2.5.0/css/amazeui.css">
-    <link rel="stylesheet" type="text/css" href="http://cdn.amazeui.org/amazeui/2.5.0/css/amazeui.min.css">
-    <script type="text/javascript" src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.js"></script>
-    <script type="text/javascript" src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.min.js"></script>
-    <script type="text/javascript" src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.ie8polyfill.js"></script>
-    <script type="text/javascript" src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.ie8polyfill.min.js"></script>
-    <script type="text/javascript" src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.widgets.helper.js"></script>
-    <script type="text/javascript" src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.widgets.helper.min.js"></script>
-    <!-- 自定义样式 -->
-    <link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/css/qywechat/info.css?v=20160101">
-    <!-- 插件 -->
-    <script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qywechat/jquery.valert.js?v=20160106"></script>
-    <script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qywechat/jquery.vloading.js?v=20160106"></script>
-</head>
-<body>
-<?php echo $content; ?>
-</body>
-</html>

+ 0 - 14
www/protected/modules/moonclub/views/layouts/techHomeLayout.php

@@ -1,14 +0,0 @@
-<!DOCTYPE>
-<html>
-<head>
-    <title></title>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0" />
-    <link rel="stylesheet" href="http://cdn.amazeui.org/amazeui/2.5.0/css/amazeui.min.css">
-    <script type="text/javascript" src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.js"></script>
-    <!-- <script src="http://cdn.amazeui.org/amazeui/2.5.0/js/amazeui.min.js"></script> -->
-</head>
-<body>
-<?php echo $content; ?>
-</body>
-</html>

+ 0 - 5
www/protected/modules/moonclub/views/myComment/error.php

@@ -1,5 +0,0 @@
-<script type="text/javascript">
-document.title = '错误';
-var message = <?php echo json_encode($msg); ?>;
-$.valert(message);
-</script>

+ 0 - 88
www/protected/modules/moonclub/views/myComment/index.php

@@ -1,88 +0,0 @@
-<div id="main">
-    <div id="head" class="layoutbox">
-        <div id="vselect"></div>
-    </div>
-    <div id="content" class="layoutbox" style="display: none;">
-        <div id="info" class="am-g">
-            <div class="am-u-sm-12 am-text-center am-text-default">
-                <span>该月共有&nbsp;{{count}}条评价</span>
-            </div>
-        </div>
-        <div id="vtable" style="margin-top: 2%;"></div>
-    </div>
-    <div id="footer"></div>
-</div>
-<script type="text/javascript">
-/* sessionStorage设置 */
-if (!sessionStorage.getItem('timelist_index_comment')) {
-    sessionStorage.setItem('timelist_index_comment', '0');
-    var timelist_index_comment = 0;
-} else {
-    timelist_index_str = sessionStorage.getItem('timelist_index_comment');
-    var timelist_index_comment = parseInt(timelist_index_str);
-}
-
-var username = <?php echo json_encode($username); ?>;
-document.title = '我的评价-'+username;
-/* 获取变量 */
-var userid = <?php echo json_encode($userid); ?>;
-var user = <?php echo json_encode($user); ?>;
-var timelist = <?php echo json_encode($timelist); ?>;
-var jq_vtable = $('#vtable');
-var jq_vselect = $('#vselect');
-
-jq_vselect.vselect({
-    options: timelist,
-    selected: timelist_index_comment,
-    onSelect: function(value, index) {
-        // 筛选列表
-        jq_vtable.vtable({
-            page: 1,
-            query: {
-                userid: userid,
-                start: value
-            }
-        });
-        // sessionStorage设置
-        sessionStorage.setItem('timelist_index_comment', index);
-    }
-});
-
-/* vtable插件 */
-jq_vtable.vtable({
-    url: '/index.php?r=o2o/myComment/list',
-    pagination: true,
-    rows: 30,
-    sort: 'time',
-    query: {
-        userid: userid,
-        start: timelist[jq_vselect.getVIndex()]['value']
-    },
-    columns: [
-        {key: 'time_str_short', name: '时间'},
-        {key: 'score', name: '评分'}
-    ],
-    beforeLoad: function() {
-        $.vloading('open');
-    },
-    onSelect: function(index, row) {
-        if (row.order == '') {
-            $.valert('订单信息未录入');
-        }
-        window.location.href = '/index.php?r=o2o/myComment/info&order='+row.order+'&user='+user;
-    },
-    afterLoad: function(data) {
-        $.vloading('close');
-        v_info.count = data.count;
-        $('#content').show();
-    }
-});
-
-/* 基本信息 */
-var v_info = new Vue({
-    el: '#info',
-    data: {
-        count: 0
-    }
-});
-</script>

+ 0 - 106
www/protected/modules/moonclub/views/myComment/info.php

@@ -1,106 +0,0 @@
-<div>
-    <div id="header">
-        <div class="am-g">
-            <div class="am-u-sm-12">
-                <div class="layoutbox">
-                    评价详情
-                </div>
-            </div>
-        </div>
-    </div>
-    <!-- 订单详情 -->
-    <div id="info">
-        <div class="am-popup-bd" id="info_content" style="display: none;">
-            <div class="am-g">
-                <div class="am-u-sm-4">预约时间</div>
-                <div class="am-u-sm-8">{{info.booking_time_str}}</div>
-            </div>
-            <div class="am-g">
-                <div class="am-u-sm-4">客户姓名</div>
-                <div class="am-u-sm-8">{{info.address.name}}</div>
-            </div>
-            <div class="am-g">
-                <div class="am-u-sm-4">地址</div>
-                <div class="am-u-sm-8">{{info.address.city}}&nbsp;{{info.address.area}}&nbsp;{{info.address.poi.name}}&nbsp;{{info.address.detail}}</div>
-            </div>
-            <div class="am-g">
-                <div class="am-u-sm-4">客户电话</div>
-                <div class="am-u-sm-8"><a href="tel:{{info.address.mobile}}">{{info.address.mobile}}</a></div>
-            </div>
-            <div class="am-g">
-                <div class="am-u-sm-4">评价信息</div>
-                <div class="am-u-sm-8">{{info.comment}}</a></div>
-            </div>
-            <br>
-            <div class="am-g">
-                <div class="am-u-sm-4">产品</div>
-                <div class="am-u-sm-12">
-                    <ul class="am-list am-list-static am-list-border">
-                        <li v-for="product in info.products">
-                            名称:&nbsp;{{info.products[0].product.name}}<br>
-                            价格:&nbsp;{{info.products[0].product.price}}
-                        </li>
-                    </ul>
-                </div>
-            </div>
-            <div class="am-g" v-if="info.append_orders.length > 0">
-                <div class="am-u-sm-4">追加订单</div>
-                <div class="am-u-sm-12">
-                    <ul class="am-list am-list-static am-list-border">
-                        <li v-for="append in info.append_orders">
-                            <ul class="am-list am-list-static am-list-border">
-                                <li v-for="product in append.products">
-                                    服务:&nbsp;{{product.name}}<br>
-                                    价格:&nbsp;{{product.price}}
-                                </li>
-                            </ul>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script type="text/javascript">
-document.title = '评价详情';
-var order = <?php echo json_encode($order); ?>;
-var user = <?php echo json_encode($user); ?>;
-
-var v_order = new Vue({
-    el: '#info',
-    data: {
-        info: []
-    }
-});
-
-$(function() {
-    getCommentInfo(order, user);
-});
-
-function getCommentInfo(order, user) {
-    // ID为空则弹窗提示
-    if (order.length == 0 || user.length == 0) {
-        $.valert('订单信息未录入');
-        return false;
-    }
-
-    $.vloading('open');
-    $.post(
-        '/index.php?r=o2o/o2oApp/getCommentInfo',
-        {
-            id : order,
-            user : user
-        },
-        function(res) {
-            $.vloading('close');
-            var data = $.parseJSON(res);
-            if (data.success == false) {
-                $.valert(data.msg);
-            } else {
-                v_order.info = data.content;
-                $('#info_content').show();
-            }
-        }
-    );
-}
-</script>

+ 0 - 5
www/protected/modules/moonclub/views/myCommision/error.php

@@ -1,5 +0,0 @@
-<script type="text/javascript">
-document.title = '错误';
-var message = <?php echo json_encode($msg); ?>;
-$.valert(message);
-</script>

+ 0 - 95
www/protected/modules/moonclub/views/myCommision/index.php

@@ -1,95 +0,0 @@
-<div id="main">
-    <div id="head" class="layoutbox">
-        <div id="vselect"></div>
-    </div>
-    <div id="content" class="layoutbox">
-        <div id="info" class="am-g">
-            <div class="am-u-sm-6 am-text-center am-text-default">
-                <span>完成单数&nbsp;{{count}}&nbsp;单</span>
-            </div>
-            <div class="am-u-sm-6 am-text-center am-text-default">
-                <span>总提成&nbsp;{{sum}}&nbsp;元</span>
-            </div>
-        </div>
-        <div id="vtable" style="margin-top: 2%;"></div>
-    </div>
-    <div id="footer" class="layoutbox"></div>
-</div>
-<script type="text/javascript">
-/* sessionStorage设置 */
-if (!sessionStorage.getItem('timelist_index_commision')) {
-    sessionStorage.setItem('timelist_index_commision', '0');
-    var timelist_index_commision = 0;
-} else {
-    timelist_index_str = sessionStorage.getItem('timelist_index_commision');
-    var timelist_index_commision = parseInt(timelist_index_str);
-}
-
-var username = <?php echo json_encode($username); ?>;
-document.title = '我的提成-'+username;
-/* 获取变量 */
-var userid = <?php echo json_encode($userid); ?>;
-var user = <?php echo json_encode($user); ?>;
-var timelist = <?php echo json_encode($timelist); ?>;
-var jq_vtable = $('#vtable');
-var jq_vselect = $('#vselect');
-
-jq_vselect.vselect({
-    options: timelist,
-    selected: timelist_index_commision,
-    onSelect: function(value, index) {
-        // 筛选列表
-        jq_vtable.vtable({
-            page: 1,
-            query: {
-                userid: userid,
-                start: value
-            }
-        });
-        // sessionStorage设置
-        sessionStorage.setItem('timelist_index_commision', index);
-    }
-});
-
-/* 基本信息 */
-var v_info = new Vue({
-    el: '#info',
-    data: {
-        count: 0,
-        sum: 0
-    }
-});
-
-/* vtable插件 */
-jq_vtable.vtable({
-    url: '/index.php?r=o2o/myCommision/list',
-    pagination: true,
-    rows: 30,
-    sort: 'time',
-    query: {
-        userid: userid,
-        start: timelist[jq_vselect.getVIndex()]['value']
-    },
-    columns: [
-        {key: 'booking_time_str', name: '预约时间'},
-        {key: 'commision', name: '提成'},
-        {key: 'type_str', name: '类型'}
-    ],
-    beforeLoad: function() {
-        $.vloading('open');
-    },
-    onSelect: function(index, row) {
-        var order = row.order;
-        if (order.length == 0 || (row.type != 0 && row.type != 1)) {
-            $.valert('订单信息未录入');
-        } else {
-            window.location.href = '/index.php?r=o2o/myCommision/info&order='+order+'&user='+user+'&type='+row.type;
-        }
-    },
-    afterLoad: function(data) {
-        $.vloading('close');
-        v_info.sum = data.sum;
-        v_info.count = data.count;
-    }
-});
-</script>

+ 0 - 83
www/protected/modules/moonclub/views/myCommision/info_append.php

@@ -1,83 +0,0 @@
-<div>
-    <div id="header">
-        <div class="am-g">
-            <div class="am-u-sm-12">
-                <div class="layoutbox">
-                    订单详情
-                </div>
-            </div>
-        </div>
-    </div>
-    <!-- 订单详情 -->
-    <div id="info">
-        <div class="am-popup-bd" id="info_content" style="display: none;">
-            <div class="am-g">
-                <div class="am-u-sm-4">追加时间</div>
-                <div class="am-u-sm-8">{{info.append_time_str}}</div>
-            </div>
-            <div class="am-g">
-                <div class="am-u-sm-4">产品</div>
-                <div class="am-u-sm-12">
-                    <ul class="am-list am-list-static am-list-border">
-                        <li v-for="product in info.products">
-                            名称:&nbsp;{{product.name}}<br>
-                            价格:&nbsp;{{product.price}}
-                        </li>
-                    </ul>
-                </div>
-            </div>
-            <div class="am-g">
-                <button type="button" class="am-btn am-btn-warning am-radius" style="width:100%;"
-                onclick="getOrderInfo();">查看被追加的订单</button>
-                <input type="hidden" id="order" :value="info.order" />
-            </div>
-        </div>
-    </div>
-</div>
-<script type="text/javascript">
-document.title = '我的提成-详情';
-var order = <?php echo json_encode($order); ?>;
-var user = <?php echo json_encode($user); ?>;
-
-var v_order = new Vue({
-    el: '#info',
-    data: {
-        info: []
-    }
-});
-
-$(function() {
-    getCommisionInfo(order, user);
-});
-
-function getOrderInfo(order) {
-    var orderID = $('#order').val();
-    window.location.href = '/index.php?r=o2o/myCommision/info&order='+orderID+'&user='+user+'&type='+0;
-}
-
-function getCommisionInfo(order, user) {
-    if (order.length == 0 || user.length == 0) {
-        $.valert('订单信息未录入');
-        return false;
-    }
-
-    $.vloading('open');
-    $.post(
-        '/index.php?r=o2o/o2oApp/getAppendInfo',
-        {
-            id: order,
-            user: user
-        },
-        function(res) {
-            $.vloading('close');
-            var data = $.parseJSON(res);
-            if (data.success == false) {
-                $.valert(data.msg);
-            } else {
-                v_order.info = data.content;
-                $('#info_content').show();
-            }
-        }
-    );
-}
-</script>

+ 0 - 101
www/protected/modules/moonclub/views/myCommision/info_order.php

@@ -1,101 +0,0 @@
-<div>
-    <div id="header">
-        <div class="am-g">
-            <div class="am-u-sm-12">
-                <div class="layoutbox">
-                    订单详情
-                </div>
-            </div>
-        </div>
-    </div>
-    <!-- 订单详情 -->
-    <div id="info">
-        <div class="am-popup-bd" id="info_content" style="display: none;">
-            <div class="am-g">
-                <div class="am-u-sm-4">预约时间</div>
-                <div class="am-u-sm-8">{{info.booking_time_str}}</div>
-            </div>
-            <div class="am-g">
-                <div class="am-u-sm-4">客户姓名</div>
-                <div class="am-u-sm-8">{{info.address.name}}</div>
-            </div>
-            <div class="am-g">
-                <div class="am-u-sm-4">地址</div>
-                <div class="am-u-sm-8">{{info.address.city}}&nbsp;{{info.address.area}}&nbsp;{{info.address.poi.name}}&nbsp;{{info.address.detail}}</div>
-            </div>
-            <div class="am-g">
-                <div class="am-u-sm-4">客户电话</div>
-                <div class="am-u-sm-8"><a href="tel:{{info.address.mobile}}">{{info.address.mobile}}</a></div>
-            </div>
-            <br>
-            <div class="am-g">
-                <div class="am-u-sm-4">产品</div>
-                <div class="am-u-sm-12">
-                    <ul class="am-list am-list-static am-list-border">
-                        <li v-for="product in info.products">
-                            名称:&nbsp;{{info.products[0].product.name}}<br>
-                            价格:&nbsp;{{info.products[0].product.price}}
-                        </li>
-                    </ul>
-                </div>
-            </div>
-            <div class="am-g" v-if="info.append_orders.length > 0">
-                <div class="am-u-sm-4">追加订单</div>
-                <div class="am-u-sm-12">
-                    <ul class="am-list am-list-static am-list-border">
-                        <li v-for="append in info.append_orders">
-                            <ul class="am-list am-list-static am-list-border">
-                                <li v-for="product in append.products">
-                                    服务:&nbsp;{{product.name}}<br>
-                                    价格:&nbsp;{{product.price}}
-                                </li>
-                            </ul>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script type="text/javascript">
-document.title = '我的提成-详情';
-var order = <?php echo json_encode($order); ?>;
-var user = <?php echo json_encode($user); ?>;
-
-var v_order = new Vue({
-    el: '#info',
-    data: {
-        info: []
-    }
-});
-
-$(function() {
-    getCommisionInfo(order, user);
-});
-
-function getCommisionInfo(order, user) {
-    if (order.length == 0 || user.length == 0) {
-        $.valert('订单信息未录入');
-        return false;
-    }
-
-    $.vloading('open');
-    $.post(
-        '/index.php?r=o2o/o2oApp/getOrderInfo',
-        {
-            id: order,
-            user: user
-        },
-        function(res) {
-            $.vloading('close');
-            var data = $.parseJSON(res);
-            if (data.success == false) {
-                $.valert(data.msg);
-            } else {
-                v_order.info = data.content;
-                $('#info_content').show();
-            }
-        }
-    );
-}
-</script>

+ 0 - 5
www/protected/modules/moonclub/views/myOrder/error.php

@@ -1,5 +0,0 @@
-<script type="text/javascript">
-document.title = '错误';
-var message = <?php echo json_encode($msg); ?>;
-$.valert(message);
-</script>

+ 0 - 88
www/protected/modules/moonclub/views/myOrder/index.php

@@ -1,88 +0,0 @@
-<div id="main">
-    <div id="head" class="layoutbox">
-        <div id="vselect"></div>
-    </div>
-    <div id="content" class="layoutbox">
-        <div id="info" class="am-g">
-            <div class="am-u-sm-12 am-text-center am-text-default">
-                <span>该月共有&nbsp;{{count}}个订单</span>
-            </div>
-        </div>
-        <div id="vtable" style="margin-top: 2%;"></div>
-    </div>
-    <div id="footer"></div>
-</div>
-<script type="text/javascript">
-/* sessionStorage设置 */
-if (!sessionStorage.getItem('timelist_index_order')) {
-    sessionStorage.setItem('timelist_index_order', '0');
-    var timelist_index_order = 0;
-} else {
-    timelist_index_str = sessionStorage.getItem('timelist_index_order');
-    var timelist_index_order = parseInt(timelist_index_str);
-}
-
-var username = <?php echo json_encode($username); ?>;
-document.title = '我的订单-'+username;
-/* 获取变量 */
-var userid = <?php echo json_encode($userid); ?>;
-var user = <?php echo json_encode($user); ?>;
-var timelist = <?php echo json_encode($timelist); ?>;
-var jq_vtable = $('#vtable');
-var jq_vselect = $('#vselect');
-
-jq_vselect.vselect({
-    options: timelist,
-    selected: timelist_index_order,
-    onSelect: function(value, index) {
-        // 筛选列表
-        jq_vtable.vtable({
-            page: 1,
-            query: {
-                userid: userid,
-                start: value
-            }
-        });
-        // sessionStorage设置
-        sessionStorage.setItem('timelist_index_order', index);
-    }
-});
-
-var v_info = new Vue({
-    el: '#info',
-    data: {
-        count: 0
-    }
-});
-
-/* vtable插件 */
-jq_vtable.vtable({
-    url: '/index.php?r=o2o/myOrder/list',
-    pagination: true,
-    rows: 30,
-    sort: 'booking_time',
-    query: {
-        userid: userid,
-        start: timelist[jq_vselect.getVIndex()]['value']
-    },
-    columns: [
-        {key: 'booking_time_str', name: '预约时间'},
-        {key: 'status_str', name: '状态'}
-    ],
-    beforeLoad: function() {
-        $.vloading('open');
-    },
-    onSelect: function(index, row) {
-        var order = row.id;
-        if (order.length == 0) {
-            $.valert('订单信息未录入');
-        } else {
-            window.location.href = '/index.php?r=o2o/myOrder/info&order='+order+'&user='+user;
-        }
-    },
-    afterLoad: function(data) {
-        $.vloading('close');
-        v_info.count = data.count;
-    }
-});
-</script>

+ 0 - 557
www/protected/modules/moonclub/views/myOrder/info.php

@@ -1,557 +0,0 @@
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=B349f0b32ef6e78b2e678f45cb9fddaf"></script>
-<link href="//cdn.bootcss.com/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css" rel="stylesheet">
-<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/jq-signature.min.js"></script>
-
-<link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/css">
-<div>
-  <div id="header">
-    <div class="am-g">
-      <div class="am-u-sm-12">
-        <div class="layoutbox">
-          订单详情
-        </div>
-      </div>
-    </div>
-  </div>
-  <!-- 订单详情 -->
-  <div id="info">
-    <div class="am-popup-bd" id="info_content" style="display: none;">
-      <div class="am-g">
-        <div class="am-u-sm-4">预约时间</div>
-        <div class="am-u-sm-8">{{info.booking_time_str}}</div>
-      </div>
-      <div class="am-g">
-        <div class="am-u-sm-4">客户姓名</div>
-        <div class="am-u-sm-8">{{info.address.name}}</div>
-      </div>
-      <div class="am-g">
-        <div class="am-u-sm-4">地址</div>
-        <div class="am-u-sm-8">{{info.address.city}}&nbsp;{{info.address.area}}&nbsp;{{info.address.poi.name}}&nbsp;{{info.address.detail}}</div>
-      </div>
-      <div class="am-g">
-        <div class="am-u-sm-4">客户电话</div>
-        <div class="am-u-sm-8"><a href="tel:{{info.address.mobile}}">{{info.address.mobile}}</a></div>
-      </div>
-      <div class="am-g">
-        <div class="am-u-sm-4">订单状态</div>
-        <div class="am-u-sm-8">{{info.status_str}}</div>
-      </div>
-      <br>
-      <div class="am-g">
-        <div class="am-u-sm-6">
-          <button class="am-btn am-btn-primary" style="width: 100%;" id="showMap">显示地图</button>
-        </div>
-        <div class="am-u-sm-6">
-          <button class="am-btn am-btn-default" style="width: 100%;" id="hideMap">隐藏地图</button>
-        </div>
-      </div>
-      <div class="am-g">
-        <div class="am-u-sm-12">
-          <div id="map_box" style="display: none;">
-            <div id="map_container" style="margin-top: 10px; width: 100%;"></div>
-          </div>
-        </div>
-      </div>
-      <br>
-      <div class="am-g">
-        <div class="am-u-sm-4">产品</div>
-        <div class="am-u-sm-12">
-          <ul class="am-list am-list-static am-list-border">
-            <li v-for="product in info.products">
-              名称:&nbsp;<span id="formProductName">{{info.products[0].product.name}}</span><br>
-              价格:&nbsp;{{info.products[0].product.price}}
-            </li>
-          </ul>
-        </div>
-      </div>
-      <div class="am-g" v-if="info.append_orders.length > 0">
-        <div class="am-u-sm-4">追加订单</div>
-        <div class="am-u-sm-12">
-          <ul class="am-list am-list-static am-list-border">
-            <li v-for="append in info.append_orders">
-              <ul class="am-list am-list-static am-list-border">
-                <li v-for="product in append.products">
-                  服务:&nbsp;{{product.name}}<br>
-                  价格:&nbsp;{{product.price}}
-                </li>
-              </ul>
-            </li>
-          </ul>
-        </div>
-      </div>
-      <div class="am-g am-hide" id="confirm_container">
-        <div class="am-u-sm-12">
-          <button class="am-btn am-btn-block am-btn-primary" id="confirm_set_out">确认订单</button>
-        </div>
-      </div>
-      <div class="am-g am-hide" id="setout_container">
-        <div class="am-u-sm-12">
-          <button class="am-btn am-btn-block am-btn-primary" id="confirm_set_out">确认出发</button>
-        </div>
-      </div>
-      <div class="am-g am-hide" id="come_container">
-        <div class="am-u-sm-12">
-          <button class="am-btn am-btn-block am-btn-primary" id="confirm_come">确认上门</button>
-        </div>
-      </div>
-      <div class="am-g am-hide" id="has_come_container">
-        <div class="am-u-sm-12">
-          <button class="am-btn am-btn-block am-btn-primary">已上门</button>
-        </div>
-      </div>
-      <div class="am-g am-hide" id="has_come_success">
-        <div class="am-u-sm-12">
-          <button class="am-btn am-btn-block am-btn-primary am-disabled">已完成</button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<!--手写板-->
-<div id="pics"
-     style="position: fixed;width: 100%;background: #fff;top:0;display: none;text-align: center;padding-bottom: 10px;">
-  <div class="">
-    <div class="">
-      <div class="js-signature"></div>
-    </div>
-    <p style="margin:0;border-top: 1px solid rgba(0,0,0,0.3);padding-top: 4px;">
-      <button id="returnBtn" class="btn btn-default">返回</button>
-      <button id="clearBtn" class="btn btn-default" onclick="clearCanvas();">清除</button>
-      &nbsp;
-      <button id="saveBtn" class="btn btn-default" onclick="saveSignature();" disabled>确认财产无误</button>
-    </p>
-  </div>
-</div>
-<div style="clear: both"></div>
-<!--表单-->
-<div id="orderForm"
-     class="am-hide"
-     style="position: fixed;top: 0;width: 100%;background: rgba(255,255,255,1);color:rgb(0,0,0);">
-  <h1 style="text-align: center;margin-top: 1rem" id="formH1">民宿保洁检查表</h1>
-  <form action="" id="orderFormTitle" class="form-ul">
-    <div class="form-ul" style="position: fixed;5rem;">
-      <!--设备检查-->
-      <div id="orderForm1" class="am-hide">
-        <h3 style="text-align: left">设备检查</h3>
-        <input type="checkbox" value="电视机">电视机有遥控器、可开启。<br/>
-        <input type="checkbox" value="空调">空调有遥控器、可开启。<br/>
-        <input type="checkbox" value="冰箱">冰箱运行中。<br/>
-        <input type="checkbox" value="Wifi">Wifi可连接。<br/>
-      </div>
-      <!--卧室客厅-->
-      <div id="orderForm2" class="am-hide">
-        <h3 style="text-align: left">卧室客厅</h3>
-        <input type="checkbox" value="四件套">四件套,已换新,无污无毛发。<br/>
-        <input type="checkbox" value="床底">床底,床沿触手可及处,无异物。<br/>
-        <input type="checkbox" value="床头柜"><span>床头柜,抽屉内无前客残留物,台面干净、无灰尘污迹。</span><br/>
-        <input type="checkbox" value="地面">地面,扫过一遍,无明显毛发、灰尘、污迹。<br/>
-        <input type="checkbox" value="茶几、写字台">茶几、写字台,台面干净、无灰尘污迹。<br/>
-      </div>
-      <!--洗手间-->
-      <div id="orderForm3" class="am-hide">
-        <h3 style="text-align: left">洗手间</h3>
-        <input type="checkbox" value="马桶">马桶洗刷一遍,清洁无渍,无毛发,马桶盖翻开。<br/>
-        <input type="checkbox" value="台盆">台盆,台面台盆整洁,已擦干,无渍无毛发。<br/>
-        <input type="checkbox" value="浴缸、淋浴房">浴缸、淋浴房,已擦干,无渍无毛发。<br/>
-        <input type="checkbox" value="地面">地面拖过一遍、无明显毛发、灰尘、污迹。<br/>
-      </div>
-      <!--厨房-->
-      <div id="orderForm4" class="am-hide">
-        <h3 style="text-align: left">厨房</h3>
-        <input type="checkbox" value="冰箱">厨房无前客残留物,内无食物残留污迹。<br/>
-        <input type="checkbox" value="微波炉">微波炉内壁托盘无明显食物残留污迹。<br/>
-        <input type="checkbox" value="灶台、厨具">灶台、厨具灶台清洁无油渍,使用过的厨具清洗擦拭收纳。<br/>
-        <input type="checkbox" value="餐桌">餐桌擦拭一遍,无污迹油渍。。<br/>
-        <input type="checkbox" value="水斗">水斗无厨余残存痕迹。<br/>
-        <input type="checkbox" value="地面">地面扫过一遍,无明显灰尘、污迹。<br/>
-      </div>
-      <!--最后检查-->
-      <div id="orderForm5" class="am-hide form-group">
-        <h3 style="text-align: left">最后检查</h3>
-        <div class="col-xs-12 col-sm-12 col-md-12">
-          <input type="checkbox" value="窗户">窗户闭合关实。<br/>
-          <input type="checkbox" value="电器">电器除冰箱、wifi外,其它家电关闭状态。<br/>
-        </div>
-        <h4>物料</h4>
-        <div class="" style="display: block">
-          <span class="col-xs-8 col-md-8">卧室、客厅,有纸巾摆放包数。</span>
-          <select name="" class="" id="">
-            <option value="0">0</option>
-            <option value="0-5">0-5</option>
-            <option value="5-10">5-10</option>
-            <option value="10-20">10-20</option>
-          </select>
-        </div>
-        <div class="col-lg-12">
-          <span class="col-xs-8 col-md-8">厕所,有卷纸摆放包数。</span>
-          <br>
-          <select name="" class="" id="">
-            <option value="0">0</option>
-            <option value="0-5">0-5</option>
-            <option value="5-10">5-10</option>
-            <option value="10-20">10-20</option>
-          </select>
-        </div>
-        <div class="col-xs-12 col-sm-12 col-md-12">
-          <input type="checkbox"> 洗发水、沐浴露预估存于30%以上。
-        </div>
-      </div>
-    </div>
-    <div style="text-align: center;position:fixed;bottom:1rem;margin-top: 1rem;" class="col-xs-12 col-sm-12 col-md-12">
-      <a class="btn btn-danger" id="formNO">取消</a>
-      &nbsp;&nbsp;
-      <a class="btn btn-success" id="formYes">确认</a>
-    </div>
-  </form>
-</div>
-<script type="text/javascript">
-  /*设置全局变量*/
-  var url;
-  var index = 0;
-  /*表单js*/
-  $(function () {
-    /*取消*/
-    $('#formNO').on('click', function () {
-      if (index == 0) {
-        $('#orderForm').addClass('am-hide');
-        $('#orderForm1').addClass('am-hide');
-        return false;
-      }
-      if (index == 1) {
-        $('#orderForm1').removeClass('am-hide');
-        $('#orderForm2').addClass('am-hide');
-        index = 0;
-        return false;
-      }
-      if (index == 2) {
-        $('#orderForm2').removeClass('am-hide');
-        $('#orderForm3').addClass('am-hide');
-        index = 1;
-        return false;
-      }
-      if (index == 3) {
-        $('#orderForm3').removeClass('am-hide');
-        $('#orderForm4').addClass('am-hide');
-        index = 2;
-        return false;
-      }
-      if (index == 4) {
-        $('#orderForm4').removeClass('am-hide');
-        $('#orderForm5').addClass('am-hide');
-        index = 3;
-        return false;
-      }
-    });
-    /*确认*/
-    $('#formYes').on('click', function () {
-      if (index == 0) {
-        $('#orderForm1').addClass('am-hide');
-        $('#orderForm2').removeClass('am-hide');
-        index = 1;
-        return false;
-      }
-      if (index == 1) {
-        $('#orderForm2').addClass('am-hide');
-        $('#orderForm3').removeClass('am-hide');
-        index = 2;
-        return false;
-      }
-      if (index == 2) {
-
-        $('#orderForm3').addClass('am-hide');
-        $('#orderForm4').removeClass('am-hide');
-        index = 3;
-        return false;
-      }
-      if (index == 3) {
-
-        $('#orderForm4').addClass('am-hide');
-        $('#orderForm5').removeClass('am-hide');
-        index = 4;
-        return false;
-      }
-      if (index == 4) {
-        $('#orderForm5').addClass('am-hide');
-
-        //隐藏表单
-        $('#orderForm').addClass('am-hide');
-        /*调用手写板*/
-        $('#has_come_container').addClass('am-hide');
-        $('#has_come_success').removeClass('am-hide');
-        $('#pics').css('display', 'block');
-        $('.js-signature').eq(0).on('jq.signature.changed', function () {
-          $('#saveBtn').attr('disabled', false);
-        });
-      }
-
-    });
-    /*返回*/
-    $('#returnBtn').on('click', function () {
-      index = 0;
-      $('#pics').css('display', 'none');
-      $('#has_come_container').removeClass('am-hide');
-      $('#has_come_success').addClass('am-hide');
-    })
-  });
-  /*form样式调整*/
-  $(function () {
-    /*设置ul与li样式*/
-    $('ul.form-ul').css("margin", '0').css('padding', '0');
-    $('ul.form-ul').children('li').css("list-style", 'none');
-    /*设置ul的宽度*/
-    $('ul.form-ul').children('li').width(($(window).width()));
-    /*设置ul的高度  orderFormOne*/
-    $('ul.form-ul').height($('#orderForm1').height());
-    /*设置li的宽度*/
-//    $('ul.form-ul').children('li').width($(window).width());
-    /*设置表单的margin-top*/
-    var formMargin = ((($(window).height()) - ($('#orderFormTitle').height())) / 6) - (($('#formH1').height()) * 3);
-    $('#orderFormTitle').css('margin-top', formMargin);
-    $('#orderForm').height($(window).height());
-    /*设置body的外边距为0*/
-    $('body').css('margin', '0');
-  });
-  /*手写板js*/
-  $(document).on('ready', function () {
-    if ($('.js-signature').length) {
-      $('.js-signature').jqSignature();
-    }
-  });
-  $('.js-signature').eq(0).on('jq.signature.changed', function () {
-    $('#saveBtn').attr('disabled', false);
-  });
-  $('#pics').height($(window).height());//设置底层div高度
-  $("canvas").width($(window).width());//设置手写板宽度
-  $("canvas").height($(window).height() - ($('#saveBtn').height()));//设置手写板高度
-  document.title = '我的订单-详情';
-  var order = <?php echo json_encode($order); ?>;
-  var user = <?php echo json_encode($user); ?>;
-  var showMap = false;
-  var w_height = $(window).height();
-  var map_height = w_height * 0.6;
-  $('#map_container').css({height: map_height + 'px'});
-  var v_order = new Vue({
-    el: '#info',
-    data: {
-      info: []
-    }
-  });
-  $(function () {
-    getOrderInfo(order, user);
-    // 显示地图
-    $('#showMap').click(function () {
-      address = v_order.info.address;
-      position = address.position;
-      if (!position) {
-        $.valert('定位信息未记录');
-        return false;
-      }
-
-      $('#map_box').show();
-
-      map = new BMap.Map('map_container');
-      point = new BMap.Point(position[0], position[1]);
-      marker = new BMap.Marker(point);
-      map.addOverlay(marker);
-      map.centerAndZoom(point, 15);
-
-      windowOpts = {
-        width: 200,
-        height: 100,
-        title: address.area
-      }
-      infoWindow = new BMap.InfoWindow(address.detail, windowOpts);
-      marker.addEventListener("click", function () {
-        map.openInfoWindow(infoWindow, point);
-      });
-    });
-    // 隐藏地图
-    $('#hideMap').click(function () {
-      $('#map_box').hide();
-    });
-    //确认订单
-    $('#confirm_container').click(function () {
-      $.vloading('open');
-      $.post(
-        '/index.php?r=o2o/myOrder/techConfirmOrder',
-        {
-          order: order,
-          user: user
-        },
-        function (res) {
-          $.vloading('close');
-          var data = $.parseJSON(res);
-          if (data.success) {
-            $('#confirm_container').addClass('am-hide');
-            $('#setout_container').removeClass('am-hide');
-            $('#come_container').addClass('am-hide');
-            $('#has_come_container').addClass('am-hide');
-          } else {
-            $.valert(data.msg);
-          }
-        }
-      );
-    });
-    // 确认出发
-    $('#setout_container').click(function () {
-      $.vloading('open');
-      $.post(
-        '/index.php?r=o2o/myOrder/techSetout',
-        {
-          order: order,
-          user: user
-        },
-        function (res) {
-          $.vloading('close');
-          var data = $.parseJSON(res);
-          if (data.success) {
-            $('#setout_container').addClass('am-hide');
-            $('#come_container').removeClass('am-hide');
-            $('#has_come_container').addClass('am-hide');
-          } else {
-            $.valert(data.msg);
-          }
-        }
-      );
-    });
-    // 确认上门
-    $('#confirm_come').click(function () {
-      $.vloading('open');
-      $.post(
-        '/index.php?r=o2o/myOrder/techCome',
-        {
-          order: order,
-          user: user
-        },
-        function (res) {
-          $.vloading('close');
-          var data = $.parseJSON(res);
-          if (data.success) {
-            $('#setout_container').addClass('am-hide');
-            $('#come_container').addClass('am-hide');
-            $('#has_come_container').removeClass('am-hide');
-            $('#has_come_success').addClass('am-hide');
-          } else {
-            $.valert(data.msg);
-          }
-        }
-      );
-    });
-    //已上门
-
-    $('#has_come_container').click(function () {
-      console.log();
-      if($('#formProductName').html()=='民宿保洁'){
-        /*调出表单*/
-        $('#orderForm').removeClass('am-hide');
-        $('#orderForm1').removeClass('am-hide');
-      }else {
-        /*调用手写板*/
-        $('#has_come_container').addClass('am-hide');
-        $('#has_come_success').removeClass('am-hide');
-        $('#pics').css('display', 'block');
-        $('.js-signature').eq(0).on('jq.signature.changed', function () {
-          $('#saveBtn').attr('disabled', false);
-        });
-      }
-//      return false;
-
-    });
-  });
-  function putb64() {
-    var pic = url.replace("data:image/png;base64,", "");//需要提交的base64
-    var uri = "http://up.qiniu.com/putb64/-1";//提交地址
-    var xhr = new XMLHttpRequest();
-    xhr.onreadystatechange = function () {
-      if (xhr.readyState == 4) {
-        $.post(
-          '/index.php?r=o2o/myOrder/techComplete',
-          {
-            order: order,
-            user: user,
-            o2oImage: xhr.responseText
-          },
-          function (res) {
-            $.vloading('close');
-            var data = $.parseJSON(res);
-            if (data.success) {
-              $('#setout_container').addClass('am-hide');
-              $('#come_container').addClass('am-hide');
-              $('#has_come_container').addClass('am-hide');
-              $('#has_come_success').removeClass('am-hide');
-            } else {
-              $.valert(data.msg);
-            }
-          }
-        );
-      }
-    }
-    xhr.open("POST", uri, true);
-    xhr.setRequestHeader("Content-Type", "application/octet-stream");
-    xhr.setRequestHeader("Authorization", "UpToken Kn8GNMFOLKTNMUaKZ6r1wnjsgTk4ideQifK3umUr:a-HCK5r5iPL8Bisb-mQLI21oZJM=:eyJzY29wZSI6ImF2YXRhcnMiLCJkZWFkbGluZSI6MTQ3NDQ1MTg0OTAwMDAwMDAwMH0=");
-    xhr.send(pic);
-  }
-  function saveSignature() {
-    $('#signature').empty();
-    url = $('.js-signature').eq(0).jqSignature('getDataURL');
-    if (url != undefined) {
-      $('#pics').css('display', 'none');
-      //七牛上传照片
-      putb64();
-    }
-  }
-  function clearCanvas() {
-    $('.js-signature').eq(0).jqSignature('clearCanvas');
-    $('#saveBtn').attr('disabled', true);
-  }
-  function getOrderInfo(order, user) {
-    if (order.length == 0 || user.length == 0) {
-      $.valert('订单信息未录入');
-      return false;
-    }
-
-    $.vloading('open');
-    $.post(
-      '/index.php?r=o2o/o2oApp/getOrderInfo',
-      {
-        id: order,
-        user: user
-      },
-      function (res) {
-        $.vloading('close');
-        var data = $.parseJSON(res);
-        if (data.success == false) {
-          $.valert(data.msg);
-        } else {
-          var content = data.content;
-          v_order.info = content;
-          for (var j in content.technicians) {
-            if (content.technicians[j]['technician_id'] == user) {
-              if (content.status != 4 && content.status != 5 && content.status != 6 && $.inArray(content.status, [1, 2, 3]) != -1) {
-                $('#confirm_container').removeClass('am-hide');
-                $('#setout_container').addClass('am-hide');
-                $('#come_container').addClass('am-hide');
-                $('#has_come_container').addClass('am-hide');
-              } else if (content.status == 4) {
-                $('#setout_container').addClass('am-hide');
-                $('#come_container').removeClass('am-hide');
-                $('#has_come_container').addClass('am-hide');
-              } else if (content.status == 5) {
-                $('#setout_container').addClass('am-hide');
-                $('#come_container').addClass('am-hide');
-                $('#has_come_container').removeClass('am-hide');
-              } else if (content.status == 6) {
-                $('#setout_container').addClass('am-hide');
-                $('#come_container').addClass('am-hide');
-                $('#has_come_container').addClass('am-hide');
-                $('#has_come_success').removeClass('am-hide');
-              }
-              break;
-            }
-          }
-          $('#info_content').show();
-        }
-      }
-    );
-  }
-</script>

+ 0 - 817
www/protected/modules/moonclub/views/tech/index.php

@@ -1,817 +0,0 @@
-<link rel="stylesheet" href="http://cdn.amazeui.org//amazeui/2.5.0/css/amazeui.min.css">
-<link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/css/datetimepicker.css">
-<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/datetimepicker.js?v=2"></script>
-<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/amazeui.datetimepicker.zh-CN.js?v=2"></script>
-<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/baidu_map/CityList.js?v=201405243209"></script>
-<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qiniu_upload_single.js?v=20200307"></script>
-<div id="main">
-    <div region="west" id="west_panel" border="false">
-        <table id="dg_content"></table>
-        <div id="tb_content">
-            <div class="tb_line">
-                <div>
-                    <input id="search">
-                    <span>状态</span>
-                    <input id="filter_status">
-                    <span>提成方案</span>
-                    <input id="filter_scheme">
-                    <div class="right">
-                        <a href="#" class='easyui-linkbutton' iconCls="icon-search" plain="true" onclick="search_content();return false;">查询</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div region="center" class="easyui-accordion">
-        <div region="center" title="基本信息">
-            <div class="easyui-layout detail_layout">
-                <div data-options="region:'center'" class="detail_center">
-                    <div class="detail_main">
-                        <form id="content_form" method="post">
-                            <ul>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>ID: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input type="hidden" name="_id" id="content_id_hide" value="" />
-                                            <span id="content_id"></span>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>名字: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input name="name" />
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>头像: </span>
-                                        </div>
-                                        <div class="box_flex f_content" id="content_avatar">
-                                            <div id="content_avatar_show"></div>
-                                            <div>
-                                                <a href="#" iconCls="icon-add" id="content_avatar_uploader" class="easyui-linkbutton" plain="true">
-                                                    上传图片
-                                                </a>
-                                            </div>
-                                            <input type="hidden" name="avatar" id="content_avatar_info" />
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>手机号: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input name="mobile" id="content_mobile" readonly/>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>状态: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input name="status" id="content_status" />
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>提成方案: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input name="scheme" id="content_scheme"/>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>服务类型: </span>
-                                        </div>
-                                        <div class="box_flex f_content" id="service_type_container">
-                                            <?php foreach ($service_type as $key => $value): ?>
-                                                <?php if (($key-1) % 4 == 0 && $key != 1): ?>
-                                                    <br>
-                                                <?php endif ?>
-                                                <span class="service_type_list">
-                                                    <input type="checkbox" value="<?=$key?>" name="service_type[]" /><?=$value['name']?>
-                                                </span>
-                                            <?php endforeach ?>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>描述: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <textarea name="desc" style="width:200px;height:120px;"></textarea>
-                                        </div>
-                                    </div>
-                                </li>
-                            </ul>
-                        </form>
-                    </div>
-                </div>
-                <div data-options="region:'south'" class="detail_south">
-                    <div class="detail_toolbar">
-                        <a href="#" class="easyui-linkbutton set_button" iconCls="icon-save" onclick="save_content();return false;">保存</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div region="center" title="微信信息">
-            <div class="easyui-layout detail_layout">
-                <div data-options="region:'center'" class="detail_center">
-                    <form id="weixin_info_form" method="post">
-                        <ul>
-                            <li class="f_item">
-                                <div class="box">
-                                    <div class="f_label">
-                                        <span>姓名</span>
-                                    </div>
-                                    <div class="box_flex f_content">
-                                        <input type="hidden" name="_id" />
-                                        <input type="hidden" name="name" />
-                                        <span id="weixin_info_name"></span>
-                                    </div>
-                                </div>
-                            </li>
-                            <li class="f_item">
-                                <div class="box">
-                                    <div class="f_label">
-                                        <span>微信ID</span>
-                                    </div>
-                                    <div class="box_flex f_content">
-                                        <input name="weixin_userid" id="weixin_info_userid" />
-                                    </div>
-                                </div>
-                            </li>
-                            <li class="f_item">
-                                <div class="box">
-                                    <div class="f_label">
-                                        <span>手机号</span>
-                                    </div>
-                                    <div class="box_flex f_content">
-                                        <input name="mobile" id="weixin_info_mobile" />
-                                    </div>
-                                </div>
-                            </li>
-                        </ul>
-                    </form>
-                </div>
-                <div data-options="region:'south'" class="detail_south">
-                    <div class="detail_toolbar">
-                        <a href="#" class="easyui-linkbutton set-button" id="save_weixin_info" iconCls="icon-save" onclick="save_weixin_info()">保存</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div region="center" title="服务时间">
-            <div class="easyui-layout detail_layout">
-                <div data-options="region:'center'" class="detail_center">
-                    <div id="datetimepicker_container"></div>
-                    <div>
-                        <form id="free_time_form" method="post">
-                            <input type="hidden" name="_id" />
-                            <input type="hidden" name="old_time_list" id="old_time_list" value="{}"/>
-                            <input type="hidden" name="new_time_list" id="new_time_list" value="{}"/>
-                        </form>
-                    </div>
-                </div>
-                <div data-options="region:'south'" class="detail_south">
-                    <div class="detail_toolbar">
-                        <a href="#" class="easyui-linkbutton set_button" id="save_selected_time" iconCls="icon-save" onclick="save_timeline();return false;">保存</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div region="center" title="服务范围">
-            <div class="easyui-layout detail_layout">
-                <div data-options="region:'center'" class="detail_center">
-                    <div style="width: 540px;height: 460px;">
-                        <div id="add_coverage_container" style="padding-bottom: 10px;display:inline-block;width:400px;"></div>
-                        <div id="add_coverage_button" style="display:inline-block;">
-                            <a href="#" class="easyui-linkbutton set_button" iconCls="icon-add" plain="true" onclick="add_coverage();">添加服务范围</a>
-                        </div>
-                        <div id="add_coverage_map_container" style="width:520px;height:340px;"></div>
-                        <div>
-                            <div id="coverage_info">
-                            </div>
-                            <form id="coverage_form" method="post">
-                                <input type="hidden" name="_id" />
-                                <input type="hidden" name="coverage_json" id="coverage_json" />
-                            </form>
-                        </div>
-                    </div>
-                </div>
-                <div data-options="region:'south'" class="detail_south">
-                    <div class="detail_toolbar">
-                        <a href="#" class="easyui-linkbutton set_button" iconCls="icon-save" onclick="save_coverage();return false;">保存</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<style type="text/css">
-body {margin: 8px;}
-.f_label {width: 90px;}
-.service_type_list {display:inline-block;width:110px;}
-</style>
-<script type="text/javascript">
-// option
-var status_option = <?php echo json_encode($status_option); ?>;
-var scheme_option = <?php echo json_encode($scheme_option); ?>;
-
-// base
-var module_root = site_root + '/index.php?r=o2o/tech';
-var w_width = $(window).width();
-var w_height = $(window).height();
-
-// datagrid
-var jq_dg_content = $('#dg_content');
-var jq_search = $('#search');
-var jq_filter_status = $('#filter_status');
-var jq_filter_scheme = $('#filter_scheme');
-
-// content_form
-var jq_content_form = $('#content_form');
-var jq_content_status = $('#content_status');
-var jq_content_scheme = $('#content_scheme');
-
-// add_form
-var jq_add_dialog = $('#add_dialog');
-var jq_add_form = $('#add_form');
-
-// free_time
-var datePickerStart = <?=json_encode($datePickerStart)?>;
-var datePickerEnd = <?=json_encode($datePickerEnd)?>;
-var jq_free_time_form = $('#free_time_form');
-
-// coverage
-var jq_coverage_form = $('#coverage_form');
-
-// weixin
-var jq_weixin_info_form = $('#weixin_info_form');
-
-$(function() {
-    var p_width = parseInt(w_width / 2);
-    if (p_width < 550) {p_width = 550}
-    var d_width = p_width - 18;
-
-    $('#west_panel').css({width: p_width});
-    $('#main').css({width: w_width - 25, height: w_height - 18}).layout();
-
-    // content_form
-    jq_content_status.combobox({
-        data: status_option,
-        editable: false
-    });
-
-    jq_content_scheme.combobox({
-        data: scheme_option,
-        editable: false
-    });
-
-    jq_content_form.form({
-        url: module_root + '/edit',
-        onSubmit: function(params) {
-            $.messager.progress();
-            var isValid = $(this).form('validate');
-            if (!isValid) {
-                $.messager.progress('close');
-            }
-            return isValid;
-        },
-        success: function(res) {
-            $.messager.progress('close');
-            var res = JSON.parse(res);
-            if(res.success) {
-                jq_dg_content.datagrid('reload');
-                $.messager.show({
-                    title: '提示',
-                    msg: '保存成功',
-                    timeout: 3500,
-                    showType: 'slide'
-                });
-            } else {
-                $.messager.show({
-                    title: '提示',
-                    msg: res.message,
-                    timeout: 3500,
-                    showType: 'slide'
-                });
-            }
-        }
-    });
-
-    // datagrid
-    jq_search.searchbox({
-        width: 150,
-        searcher: function() {
-            search_content();
-        },
-        prompt: 'ID、名字、微信ID'
-    });
-
-    jq_filter_status.combobox({
-        data: status_option,
-        width: 80,
-        editable: false,
-        onSelect: function() {
-            search_content();
-        }
-    });
-
-    jq_filter_scheme.combobox({
-        data: scheme_option,
-        width: 80,
-        editable: false,
-        onSelect: function() {
-            search_content();
-        }
-    });
-
-    jq_dg_content.datagrid({
-        height: w_height - 18,
-        width: d_width,
-        title: '保洁师列表',
-        idField: '_id',
-        url: module_root + '/list',
-        toolbar: '#tb_content',
-        nowrap: false,
-        singleSelect: true,
-        fitColumns: true,
-        queryParams: $.extend({
-            status: 1
-        }, get_param_obj()),
-        sortName: '_id',
-        sortOrder: 'asc',
-        pagination: true,
-        pageSize: 30,
-        pageList: [10, 20, 30, 50],
-        columns: [[
-            {field: 'name', title: '名字', width: 100},
-            {field: 'weixin_userid', title: '微信ID', width: 100},
-            {field: 'favourable_count', title: '好评数', width: 50},
-            {field: 'order_count', title: '服务次数', width: 50},
-            {field: 'scheme', title: '提成方案', width: 60,
-                formatter: function(value, row) {
-                    if (value == -1) {
-                        return '<span style="color: orange;">'+row['scheme_str']+'</span>';
-                    } else {
-                        return '<span>'+row['scheme_str']+'</span>';
-                    }
-                }
-            },
-            {field: 'status', title: '状态', width: 40,
-                formatter: function(value, row) {
-                    if (value == 1) {
-                        var color = 'green';
-                    } else if (value == 0) {
-                        var color = 'orange';
-                    } else {
-                        var color = 'red';
-                    }
-                    return '<span style="color:'+color+'">'+row.status_str+'</span>';
-                }
-            }
-        ]],
-        onSelect: function(index, row) {
-            // 载入数据
-            var data = $.extend(row, {});
-            jq_content_form.form('load', data);
-            $('#content_id').html(row._id);
-
-            // 头像显示
-            $('input[name="file"]').remove();
-            $('#content_avatar_show').empty();
-            if (data.avatar) {
-                var avatar_url = data.avatar;
-                $('#content_avatar_info').val(avatar_url);
-                $('#content_avatar_show').html('<img src="'+avatar_url+'" style="max-width: 60px" />');
-            } else {
-                $('#content_avatar_info').val('');
-            }
-
-            // 头像上传
-            $.fn.qiniu_upload_single('init', {
-                bucket: 'avatars',
-                button: '#content_avatar_uploader',
-                success_callback: function(result) {
-                    console.log(result);
-                    var img_url = result.url;
-
-                    var img = new Image();
-                    img.onload = function() {
-                        var imgWidth = img.width;
-                        var imgHeight = img.height;
-                        $('#content_avatar_info').val(img_url);
-                        $('#content_avatar_show').html('<img src="'+img_url+'" style="max-width: 60px;"/>');
-                    }
-                    img.src = img_url;
-                },
-                fail_callback: function() {
-                    $.messager.alert('提示', '上传失败,请重试');
-                    return false;
-                }
-            });
-
-            // 服务类型选择
-            $('#service_type_container').children().each(function (index, element) {
-                var val = parseInt($(this).find('input').val());
-                if ($.inArray(val, data.service_type) != -1) {
-                    $(this).find('input').prop('checked', true);
-                } else {
-                    $(this).find('input').prop('checked', false);
-                }
-            });
-
-            // 时间选择
-            $('#datetimepicker_container').empty();
-            $('#old_time_list').val('{}');
-            $('#new_time_list').val('{}');
-            showDatetimePicker(data._id);
-            jq_free_time_form.form('load', data);
-
-            // 服务范围选择
-            initBaiduCityList();
-            jq_coverage_form.form('load', data);
-            $('#add_coverage_button').show();
-            var coverage_info = '';
-            for (key in data.coverage) {
-                coverage_info += parse_coverage_item(data['coverage'][key], key);
-            }
-            $('#coverage_info').html(coverage_info);
-
-            // 微信信息
-            jq_weixin_info_form.form('load', data);
-            $('#weixin_info_name').html(data.name);
-            if (data.weixin_userid) {
-                $('#weixin_info_userid').attr('readonly', true);
-            } else {
-                $('#weixin_info_userid').removeAttr('readonly');
-            }
-        },
-        onLoadSuccess: function() {
-            // 基本信息
-            jq_content_form.form('clear');
-            $('#content_id').html('');
-            $('#content_avatar_show').empty();
-
-            // 时间选择
-            jq_free_time_form.form('clear');
-            $('#datetimepicker_container').empty();
-
-            // 服务范围
-            jq_coverage_form.form('clear');
-            $('#add_coverage_container').empty();
-            $('#add_coverage_map_container').empty();
-            $('#add_coverage_button').hide();
-            $('#coverage_info').empty();
-            
-            // 微信信息
-            jq_weixin_info_form.form('clear');
-            $('#weixin_info_name').empty();
-            $('#weixin_info_userid').removeAttr('disabled');
-        }
-    });
-
-    // free_time
-    jq_free_time_form.form({
-        url: module_root + '/modifyFreetime',
-        onSubmit: function(param) {
-            $.messager.progress();
-            var isValid = $(this).form('validate');
-            if (!isValid) {
-                $.messager.progress('close');
-            }
-            return isValid;
-        },
-        success: function(res) {
-            $.messager.progress('close');
-            var res = JSON.parse(res);
-
-            if (res.success) {
-                jq_dg_content.datagrid('reload');
-                $.messager.show({
-                    title: '提示',
-                    msg: '保存成功',
-                    timeout: 3500,
-                    showType: 'slide'
-                });
-            } else {
-                $.messager.show({
-                    title: '提示',
-                    msg: res.message,
-                    timeout: 3500,
-                    showType: 'slide'
-                });
-            }
-        }
-    });
-
-    // coverage
-    jq_coverage_form.form({
-        url: module_root + '/modifyCoverage',
-        onSubmit: function(param) {
-            $.messager.progress();
-            var isValid = $(this).form('validate');
-            if (!isValid) {
-                $.messager.progress('close');
-            }
-            return isValid;
-        },
-        success: function(res) {
-            $.messager.progress('close');
-            var res = JSON.parse(res);
-
-            if (res.success) {
-                jq_dg_content.datagrid('reload');
-                $.messager.show({
-                    title: '提示',
-                    msg: '保存成功',
-                    timeout: 3500,
-                    showType: 'slide'
-                });
-            } else {
-                $.messager.show({
-                    title: '提示',
-                    msg: res.message,
-                    timeout: 3500,
-                    showType: 'slide'
-                });
-            }
-        }
-    });
-
-    // 删除item绑定事件
-    $('body').on('click', '.del_coverage_item', function() {
-        var coverages = new Array();
-        if ($('#coverage_json').val()) {
-            var coverages = JSON.parse($('#coverage_json').val());
-        }
-
-        coverages.splice($(this).parent('div').attr('data'), 1);
-        $(this).parent('div').remove();
-        $('#coverage_info').children('div').each(function(index, e) {
-            $(this).attr('data', index);
-        });
-
-        $('#coverage_json').val(JSON.stringify(coverages));
-    });
-
-    // weixin_info
-    jq_weixin_info_form.form({
-        url: module_root + '/modifyWeixinInfo',
-        onSubmit: function(param) {
-            $.messager.progress();
-            var isValid = $(this).form('validate');
-            if (!isValid) {
-                $.messager.progress('close');
-            }
-            return isValid;
-        },
-        success: function(res) {
-            $.messager.progress('close');
-            var res = JSON.parse(res);
-
-            if (res.success) {
-                jq_dg_content.datagrid('reload');
-                $.messager.show({
-                    title: '提示',
-                    msg: '保存成功',
-                    timeout: 3500,
-                    showType: 'slide'
-                });
-            } else {
-                $.messager.show({
-                    title: '提示',
-                    msg: res.message,
-                    timeout: 3500,
-                    showType: 'slide'
-                });
-            }
-        }
-    });
-});
-
-function search_content() {
-    var status = jq_filter_status.combobox('getValue');
-    var scheme = jq_filter_scheme.combobox('getValue');
-    var search = jq_search.searchbox('getValue');
-
-    var query = {
-        status: status,
-        scheme: scheme,
-        search: search
-    };
-
-    jq_dg_content.datagrid({
-        queryParams: query
-    });
-}
-
-function save_content() {
-    if (!$('#content_id_hide').val()) {
-        $.messager.alert('提示', '请选择一个保洁师');
-        return false;
-    }
-
-    if (jq_content_scheme.combobox('getValue') == 100) {
-        $.messager.alert('提示', '请选择一个提成方案');
-        return false;
-    }
-
-    var status = jq_content_status.combobox('getValue');
-    if (parseInt(status) == -1) {
-        $.messager.confirm('提示', '确认删除吗?<br>该操作将删除后台用户,同时禁用微信端成员', function (r) {
-            if (!r) {
-                return false;
-            } else {
-                jq_content_form.form('submit');
-            }
-        });
-    } else {
-        jq_content_form.form('submit');
-    }
-}
-
-// 显示时间选择插件
-function showDatetimePicker(_id) {
-    $.post(
-        module_root + '/getTechTimeline',
-        {
-            _id: _id
-        },
-        function (res) {
-            var data = $.parseJSON(res);
-            var old_time_list = {};
-            var selected = {
-                day: {},
-                hours: {}
-            }
-            for (key in data) {
-                if (data[key]['selected']) {
-                    selected.day[key] = parseInt(data[key]['selected']);
-                    selected.hours[key] = data[key]['selectedHours'].slice();
-                    old_time_list[key] = data[key]['selectedHours'].slice();
-                }
-            }
-            $('#old_time_list').val(JSON.stringify(old_time_list));
-            $('#datetimepicker_container').append('<input id="datetimepicker" size="16" type="text" value="'+datePickerStart+'" readonly class="form-datetime am-form-field">');
-            initDatetimepicker(datePickerStart, datePickerEnd, selected);
-        }
-    );
-}
-
-function initDatetimepicker(startDate, endDate, selected) {
-    $('#datetimepicker').datetimepicker({
-        language:  'zh-CN',
-        format: 'yyyy-mm-dd hh:ii:ss',
-        startDate: startDate,
-        endDate: endDate,
-        startView: 2,
-        minView: 1,
-        todayBtn: true,
-        todayHighlight: true,
-        startHours: 9,
-        endHours: 19,
-        minuteStep: 10,
-        selected: selected
-    }).on('changeHour', function(event){
-        newSelectedTime(event);
-    }).on('today', function(event) {
-        newSelectedTime(event);
-    }).on('allDay', function(event) {
-        newSelectedTime(event);
-    });
-}
-
-function newSelectedTime(event) {
-    var new_time_list = JSON.parse($('#new_time_list').val());
-    if (event.type == 'today') {
-        var dateObj = new Date();
-        var today_year = dateObj.getFullYear() + '';
-        var today_month = dateObj.getMonth() + 1 + '';
-        var today_date = dateObj.getDate() + '';
-        if (today_month.length < 2) {
-            today_month = '0' + today_month;
-        }
-        if (today_date.length < 2) {
-            today_date = '0' + today_date;
-        }
-
-        var today_key = today_year + today_month + today_date;
-
-        new_time_list[today_key] = [
-            0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1, 1, 1, 1, 1, 1, 1,
-            1, 1, 1, 1, 0, 0, 0, 0
-        ];
-    } else {
-        new_time_list = event.selectedHours;
-    }
-
-    $('#new_time_list').val(JSON.stringify(new_time_list));
-}
-
-function save_timeline() {
-    jq_free_time_form.submit();
-}
-
-function initBaiduCityList() {
-    map = new BMap.Map('add_coverage_map_container');
-    map.centerAndZoom(new BMap.Point(31.229402,121.455129), 12);
-    var cityList = new BMapLib.CityList({
-        container: 'add_coverage_container',
-        map: map
-    });
-}
-
-function add_coverage() {
-    var coverages = new Array();
-    if ($('#coverage_json').val()) {
-        coverages = JSON.parse($('#coverage_json').val());
-    }
-
-    var coverage_item = {};
-    coverage_item.province = storage.getItem('province');
-    coverage_item.city     = storage.getItem('city');
-    coverage_item.area     = storage.getItem('area');
-
-    if (storage.getItem('business') && storage.getItem('business') != '请选择') {
-        coverage_item.business = storage.getItem('business');
-    }
-
-    if (coverage_item.city != '上海市') {
-        $.messager.alert('提示', '必须选择上海市');
-        return false;
-    } else if (!coverage_item.province || !coverage_item.city || !coverage_item.area) {
-        $.messager.alert('提示', '必须选择区');
-        return false;
-    } else if (!coverage_item.business) {
-        var businessArray = [];
-        $('#add_coverage_container>select').last().children().each(function (index, element) {
-            if (this.title != '请选择') {
-                var coverage_json = $('#coverage_json').val();
-                var coverages = coverage_json ? JSON.parse(coverage_json) : [];
-                coverage_item.business = this.title;
-                coverages.push(coverage_item);
-                $('#coverage_json').val(JSON.stringify(coverages));
-                $('#coverage_info').html($('#coverage_info').html() + parse_coverage_item(coverage_item, coverages.length - 1));
-            }
-        });
-    } else {
-        coverages.push(coverage_item);
-        $('#coverage_json').val(JSON.stringify(coverages));
-        $('#coverage_info').html($('#coverage_info').html() + parse_coverage_item(coverage_item, coverages.length - 1));
-    }
-
-    storage.removeItem('province');
-    storage.removeItem('city');
-    storage.removeItem('area');
-    storage.removeItem('business');
-    storage.removeItem('points');
-    initBaiduCityList();
-}
-
-function parse_coverage_item(item, index) {
-    if (item.business) {
-        return '<div data='+index+'>['+item.province+'-'+item.city+'-'+item.area+'-'+item.business+']&nbsp;&nbsp;<a href="#" class="del_coverage_item">删除</a></div>';
-    } else {
-        return '<div data='+index+'>['+item.province+'-'+item.city+'-'+item.area+']&nbsp;&nbsp;<a href="#" class="del_coverage_item">删除</a></div>';
-    }
-}
-
-function save_coverage() {
-    jq_coverage_form.submit();
-}
-
-function save_weixin_info() {
-    if (!$('#weixin_info_userid').val()) {
-        $.messager.alert('提示', '请输入微信ID');
-        return false;
-    }
-    if (!$('#weixin_info_mobile').val()) {
-        $.messager.alert('提示', '请输入手机号');
-        return false;
-    }
-    jq_weixin_info_form.submit();
-}
-</script>

+ 0 - 1
www/protected/modules/moonclub/views/techHome/error.php

@@ -1 +0,0 @@
-<h1><?=$msg?></h1>

+ 0 - 161
www/protected/modules/moonclub/views/techHome/index.php

@@ -1,161 +0,0 @@
-<link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/js/cropbox/jquery.cropbox.css">
-<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/cropbox/hammer.js"></script>
-<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/cropbox/jquery.mousewheel.js"></script>
-<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/cropbox/jquery.cropbox.js?v=2016032201"></script>
-
-<form class="am-form tech-form">
-  <fieldset>
-    <legend><?=$name?><small>个人信息</small></legend>
-    <div class="am-form-group">
-      <label for="doc-ta-1">介绍</label>
-      <textarea class="intro" rows="5" id="doc-ta-1"><?=$desc?></textarea>
-    </div>
-
-    <div class="am-form-group am-form-file">
-      <label for="doc-ipt-file-2">头像</label>
-      <div>
-        <button type="button" class="am-btn am-btn-default am-btn-sm tech-avatar-btn">
-          <i class="am-icon-cloud-upload"></i> 选择图片</button>
-        <input type="file" id="tech-avatar" style="top: initial;bottom: 0;font-size: 1.4rem;padding: .25em 1em;">
-      </div>
-    </div>
-    <p class="img-preview">
-      <img src="<?=$avatar?>" alt="" class="" width="200" height="200">
-    </p>
-    <p>
-      <!-- <button type="submit" class="am-btn am-btn-default btn-edit">编辑</button> -->
-      <button type="submit" class="am-btn am-btn-success btn-submit">提交</button>
-    </p>
-  </fieldset>
-</form>
-<div class="am-modal am-modal-alert" tabindex="-1" id="my-alert">
-  <div class="am-modal-dialog">
-    <div class="am-modal-hd">提示信息</div>
-    <div class="am-modal-bd">
-      介绍或者头像不能为空
-    </div>
-    <div class="am-modal-footer">
-      <span class="am-modal-btn">确定</span>
-    </div>
-  </div>
-</div>
-<script>
-$(function(){
-  /* 初始化参数 */
-  var tech_name   = <?=json_encode($name)?>;          // 保洁师姓名
-  var tech_id     = <?=json_encode($_id)?>;           // 保洁师后台ID
-  var token       = <?=json_encode($qiniu_token)?>;   // 七牛上传token
-  var url         = <?=json_encode($qiniu_url)?>;     // 七牛上传url_prefix
-  var avatar = <?=json_encode($avatar)?>;
-  var intro = <?=json_encode($desc)?>;
-  var cropImg = '';
-  var apiUrl = 'http:// api.yiguanjia.me';
-  if (location.host == ' apitest.yiguanjia.me') {
-    apiUrl = 'http:// apitest.yiguanjia.me';
-  } else if (location.host == 'api.yiguanjiadev.me') {
-    apiUrl = 'http://api.yiguanjiadev.me';
-  }
-
-  function edit() {
-    $('.tech-form').find('.intro').removeAttr('readonly');
-    $('#tech-avatar').removeAttr('disabled');
-    $('.tech-avatar-btn').removeClass('am-disabled');
-  }
-  function submit() {
-    $('.tech-form').find('.intro').attr('readonly', 'true');
-    $('#tech-avatar').attr('disabled', 'disabled');
-    $('.tech-avatar-btn').addClass('am-disabled');
-  }
-
-  $('.intro').on('blur', function(event) {
-    event.preventDefault();
-    intro = $(this).val();
-  });
-
-  $('.tech-form').on('click', '.btn-edit', function(event) {
-    event.preventDefault();
-    edit();
-  });
-
-  $('.tech-form').on('click', '.btn-submit', function(event) {
-    event.preventDefault();
-    if (intro == '') {
-      alert('介绍不能为空');
-    } else if (avatar == '') {
-      alert('请上传头像');
-    } else {
-      submit();
-      $.ajax({
-        url: apiUrl + '/index.php?r=o2o/techHome/updateInfo',
-        jsonp: "callback",
-        dataType: "jsonp",
-        data: {
-          tech_id: tech_id,
-          desc: intro,
-          avatar: avatar + cropImg
-        }
-      })
-      .done(function(res) {
-        alert(res.message);
-      })
-      .fail(function(res) {
-        alert(res.message);
-      })
-      .always(function() {
-        edit();
-      });
-    }
-  });
-
-  $('.tech-form').on('change', '#tech-avatar', function(event) {
-    event.preventDefault();
-
-    var files = event.target.files;
-    var formData = new FormData();
-    formData.append('token', token);
-    formData.append('file', files[0]);
-    var name = files[0].name;
-    var point = name.lastIndexOf('.'),
-        type = name.substr(point),
-        key = Math.random().toString(16).substring(2) + (+new Date()) + type;
-    formData.append('key', key);
-
-    $.ajax({
-      url: 'http://upload.qiniu.com',
-      type: 'POST',
-      data: formData,
-      processData: false,
-      contentType: false
-    })
-    .done(function(res) {
-      avatar = url + res.key
-      $('.img-preview').html('<img src="'+ url + res.key +'" alt="" class="cropimage">');
-      crop();
-    })
-    .fail(function() {
-      console.log("error");
-    })
-    .always(function() {
-      console.log("complete");
-    });
-
-  });
-
-  function crop() {
-    $('.cropimage').cropbox({
-      width: 200,
-      height: 200,
-      controls: ''
-    }, function() {
-      //on load
-
-    }).on('cropbox', function(event, results) {
-      var X = results.cropX;
-      var Y = results.cropY;
-      var W = results.cropW;
-      var H = results.cropH;
-      cropImg = '?imageMogr/v2/crop/!' + W + 'x' + H + 'a' + X + 'a' + Y;
-    });
-  }
-})
-</script>