2

src/views/WxUser/index.vue

@@ -0,0 +1,382 @@
+<template>
+    <div class="app-container">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="昵称" prop="cNickName">
+          <el-input
+            v-model="queryParams.cNickName"
+            placeholder="请输入昵称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="电话号码" prop="cPhone">
+          <el-input
+            v-model="queryParams.cPhone"
+            placeholder="请输入电话号码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <!-- <el-form-item label="消费金额" prop="dMoney">
+          <el-input
+            v-model="queryParams.dMoney"
+            placeholder="请输入消费金额"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item> 
+        <el-form-item label="下单次数" prop="nNum">
+          <el-input
+            v-model="queryParams.nNum"
+            placeholder="请输入下单次数"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>-->
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <!-- <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['system:user:add']"
+          >新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['system:user:edit']"
+          >修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['system:user:remove']"
+          >删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['system:user:export']"
+          >导出</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+   -->
+      <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
+        <el-table-column label="微信小程序openId" align="center" prop="cOpenid" />
+        <!-- <el-table-column label="微信小程序登录会话密钥" align="center" prop="cSessionKey" /> -->
+        <!-- <el-table-column label="头像" align="center" prop="cIcon" /> -->
+        <el-table-column label="头像" align="center" prop="cIcon" width="100">
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.cIcon" :width="50" :height="50"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="电话号码" align="center" prop="cPhone" />
+        <!-- <el-table-column label="微信小程序unionid" align="center" prop="cUnionid" /> -->
+        <el-table-column label="昵称" align="center" prop="cNickName" />
+        <el-table-column label="消费金额" align="center" prop="dMoney" />
+        <el-table-column label="下单次数" align="center" prop="nNum" />
+        <!-- <el-table-column label="地址信息" align="center" prop="cAddressList" /> -->
+        <el-table-column label="当前余额" align="center" prop="dBalance" />
+        <el-table-column label="总收益" align="center" prop="dAllMoney" />
+        <!-- <el-table-column label="分销码" align="center" prop="cScanImg" /> -->
+        <!-- <el-table-column label="推荐者信息" align="center" prop="cUpUser" /> -->
+        <!-- <el-table-column label="默认地址id" align="center" prop="cMrAddressId" /> -->
+        <!-- <el-table-column label="是否删除0否1是" align="center" prop="isDelete" /> -->
+        <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:user:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['system:user:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column> -->
+      </el-table>
+      <el-pagination
+        v-show="total>0"
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="queryParams.current"
+        :page-size="queryParams.size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+  
+      <!-- 添加或修改微信用户对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="微信小程序openId" prop="cOpenid">
+            <el-input v-model="form.cOpenid" placeholder="请输入微信小程序openId" />
+          </el-form-item>
+          <el-form-item label="微信小程序登录会话密钥" prop="cSessionKey">
+            <el-input v-model="form.cSessionKey" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
+          <el-form-item label="头像地址" prop="cIcon">
+            <el-input v-model="form.cIcon" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
+          <el-form-item label="电话号码" prop="cPhone">
+            <el-input v-model="form.cPhone" placeholder="请输入电话号码" />
+          </el-form-item>
+          <el-form-item label="微信小程序unionid" prop="cUnionid">
+            <el-input v-model="form.cUnionid" placeholder="请输入微信小程序unionid" />
+          </el-form-item>
+          <el-form-item label="昵称" prop="cNickName">
+            <el-input v-model="form.cNickName" placeholder="请输入昵称" />
+          </el-form-item>
+          <el-form-item label="消费金额" prop="dMoney">
+            <el-input v-model="form.dMoney" placeholder="请输入消费金额" />
+          </el-form-item>
+          <el-form-item label="下单次数" prop="nNum">
+            <el-input v-model="form.nNum" placeholder="请输入下单次数" />
+          </el-form-item>
+          <el-form-item label="地址信息" prop="cAddressList">
+            <el-input v-model="form.cAddressList" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
+          <el-form-item label="当前余额" prop="dBalance">
+            <el-input v-model="form.dBalance" placeholder="请输入当前余额" />
+          </el-form-item>
+          <el-form-item label="总收益" prop="dAllMoney">
+            <el-input v-model="form.dAllMoney" placeholder="请输入总收益" />
+          </el-form-item>
+          <el-form-item label="分销码" prop="cScanImg">
+            <el-input v-model="form.cScanImg" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
+          <el-form-item label="推荐者信息" prop="cUpUser">
+            <el-input v-model="form.cUpUser" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
+          <el-form-item label="默认地址id" prop="cMrAddressId">
+            <el-input v-model="form.cMrAddressId" placeholder="请输入默认地址id" />
+          </el-form-item>
+          <el-form-item label="是否删除0否1是" prop="isDelete">
+            <el-input v-model="form.isDelete" placeholder="请输入是否删除0否1是" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import { listUser, getUser, delUser, addUser, updateUser } from "@/api/system/wxuser";
+  
+  export default {
+    name: "User",
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 微信用户表格数据
+        userList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          current: 1,
+          size: 10,
+          cOpenid: null,
+          cSessionKey: null,
+          cIcon: null,
+          cPhone: null,
+          cUnionid: null,
+          cNickName: null,
+          dMoney: null,
+          nNum: null,
+          cAddressList: null,
+          dBalance: null,
+          dAllMoney: null,
+          cScanImg: null,
+          cUpUser: null,
+          cMrAddressId: null,
+          isDelete: null
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          cOpenid: [
+            { required: true, message: "微信小程序openId不能为空", trigger: "blur" }
+          ],
+        }
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+        handleSizeChange(val){
+            // console.log(val,"handleSizeChange")
+            this.queryParams.size = val
+            this.getList()
+        },
+        handleCurrentChange(val){
+            this.queryParams.current = val
+            this.getList()
+            // console.log(val,"val")
+        },
+      /** 查询微信用户列表 */
+      getList() {
+        this.loading = true;
+        listUser(this.queryParams).then(response => {
+          this.userList = response.data.records;
+          this.total = response.data.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          cOpenid: null,
+          cSessionKey: null,
+          cIcon: null,
+          cPhone: null,
+          cUnionid: null,
+          cNickName: null,
+          dMoney: null,
+          nNum: null,
+          cAddressList: null,
+          dBalance: null,
+          dAllMoney: null,
+          cScanImg: null,
+          cUpUser: null,
+          cMrAddressId: null,
+          createTime: null,
+          updateTime: null,
+          isDelete: null
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length!==1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加微信用户";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getUser(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改微信用户";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              updateUser(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addUser(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除微信用户编号为"' + ids + '"的数据项？').then(function() {
+          return delUser(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('system/user/export', {
+          ...this.queryParams
+        }, `user_${new Date().getTime()}.xlsx`)
+      }
+    }
+  };
+  </script>
+<style scoped>
+.el-pagination{
+    float: right;
+    padding: 30px 0;
+}
+</style>
+  

src/views/alarmWorksheet/index.vue

@@ -0,0 +1,300 @@
+<template>
+    <div class="app-container">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="客户姓名" prop="userName">
+          <el-input
+            v-model="queryParams.userName"
+            placeholder="请输入客户姓名"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="客户电话" prop="userPhone">
+          <el-input
+            v-model="queryParams.userPhone"
+            placeholder="请输入客户电话"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="技师姓名" prop="jsName">
+          <el-input
+            v-model="queryParams.jsName"
+            placeholder="请输入技师姓名"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="技师电话" prop="jsPhone">
+          <el-input
+            v-model="queryParams.jsPhone"
+            placeholder="请输入技师电话"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-table v-loading="loading" :data="alarmList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="订单编号" align="center" prop="orderNo" />
+        <!-- <el-table-column label="id" align="center" prop="id" /> -->
+        <el-table-column label="客户姓名" align="center" prop="userName" />
+        <el-table-column label="客户电话" align="center" prop="userPhone" />
+        <el-table-column label="地点" align="center">
+            <template slot-scope="scope">
+                {{ JSON.parse(scope.row.address).address }}
+            </template>
+        </el-table-column>
+        
+        <el-table-column label="技师姓名" align="center" prop="jsName" />
+        <el-table-column label="技师电话" align="center" prop="jsPhone" />
+        
+        <!-- <el-table-column label="技师id" align="center" prop="jsId" /> -->
+        <!-- <el-table-column label="用户openId" align="center" prop="openId" /> -->
+        <el-table-column label="状态" align="center">
+            <template slot-scope="scope">
+                {{ scope.row.alarmStatus === 0 ? '待处理':'已处理' }}
+            </template>
+        </el-table-column>
+
+        <!-- <el-table-column label="备注" align="center" prop="note" /> -->
+        <!-- <el-table-column label="是否删除0否1是" align="center" prop="isDelete" /> -->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-s-opportunity"
+              @click="handleUpdate(scope.row)"
+            >已处理</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+  
+      <!-- 添加或修改报警记录对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="客户姓名" prop="userName">
+            <el-input v-model="form.userName" placeholder="请输入客户姓名" />
+          </el-form-item>
+          <el-form-item label="客户电话" prop="userPhone">
+            <el-input v-model="form.userPhone" placeholder="请输入客户电话" />
+          </el-form-item>
+          <el-form-item label="地点" prop="address">
+            <el-input v-model="form.address" placeholder="请输入地点" />
+          </el-form-item>
+          <el-form-item label="技师姓名" prop="jsName">
+            <el-input v-model="form.jsName" placeholder="请输入技师姓名" />
+          </el-form-item>
+          <el-form-item label="技师电话" prop="jsPhone">
+            <el-input v-model="form.jsPhone" placeholder="请输入技师电话" />
+          </el-form-item>
+          <el-form-item label="订单编号" prop="orderNo">
+            <el-input v-model="form.orderNo" placeholder="请输入订单编号" />
+          </el-form-item>
+          <el-form-item label="技师id" prop="jsId">
+            <el-input v-model="form.jsId" placeholder="请输入技师id" />
+          </el-form-item>
+          <el-form-item label="用户openId" prop="openId">
+            <el-input v-model="form.openId" placeholder="请输入用户openId" />
+          </el-form-item>
+          <el-form-item label="备注" prop="note">
+            <el-input v-model="form.note" placeholder="请输入备注" />
+          </el-form-item>
+          <el-form-item label="是否删除0否1是" prop="isDelete">
+            <el-input v-model="form.isDelete" placeholder="请输入是否删除0否1是" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import { listAlarm, getAlarm, delAlarm, addAlarm, updateAlarm } from "@/api/system/alarm";
+  
+  export default {
+    name: "Alarm",
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 报警记录表格数据
+        alarmList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          userName: null,
+          userPhone: null,
+          address: null,
+          jsName: null,
+          jsPhone: null,
+          orderNo: null,
+          jsId: null,
+          openId: null,
+          alarmStatus: null,
+          note: null,
+          isDelete: null
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+        }
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询报警记录列表 */
+      getList() {
+        this.loading = true;
+        listAlarm(this.queryParams).then(response => {
+          this.alarmList = response.data.records;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          userName: null,
+          userPhone: null,
+          address: null,
+          jsName: null,
+          jsPhone: null,
+          orderNo: null,
+          jsId: null,
+          openId: null,
+          alarmStatus: null,
+          note: null,
+          createTime: null,
+          updateTime: null,
+          isDelete: null
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length!==1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加报警记录";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        var data = {
+            id:row.id
+        }
+        updateAlarm(data).then(res =>{
+            if(res.code == 200){
+                this.$modal.msgSuccess("处理成功");
+                this.getList();
+            }else{
+                this.$modal.msgError(res.data.msg);
+            }
+        })
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              updateAlarm(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addAlarm(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        var data = {
+            id:ids
+        }
+        this.$modal.confirm('是否确认删除报警记录编号为"' + ids + '"的数据项？').then(function() {
+
+          return delAlarm(data);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('system/alarm/export', {
+          ...this.queryParams
+        }, `alarm_${new Date().getTime()}.xlsx`)
+      }
+    }
+  };
+  </script>
+  

src/views/order/index.vue

@@ -59,12 +59,13 @@
 
         <el-table-column label="技师姓名" align="center" prop="js.cName" />
         <el-table-column label="技师电话" align="center" prop="js.cPhone" />
+        <el-table-column label="订单状态" align="center" prop="statusName" />
         <!-- <el-table-column label="备注" align="center" prop="cNote" /> -->
-        <el-table-column label="订单状态" align="center" prop="nStatus" width="180">
+        <!-- <el-table-column label="订单状态" align="center" prop="nStatus" width="180">
           <template slot-scope="scope">
             <span>{{ scope.row.nStatus ==0?'待接单':(scope.row.nStatus ==1 ? '服务中':'待评价')}}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="时间" align="center" prop="dtCreateTime" />
         <!-- <el-table-column label="推荐者id" align="center" prop="cTjOpenId" /> -->
         <!-- <el-table-column label="创建时间" align="center" prop="dtCreateTime" width="180">
@@ -110,60 +111,37 @@
       <!-- 添加或修改认领对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
         <el-form ref="form" :inline="true" :model="form" :rules="rules" label-width="90px">
-          <el-form-item label="技师id" prop="cJsId">
-            <el-input v-model="form.cJsId" placeholder="请输入技师id" />
+          <el-form-item label="订单号" prop="orderNo">
+            <el-input v-model="form.orderNo" placeholder="请输入技师id" />
           </el-form-item>
-          <el-form-item label="用户openid" prop="cOpenId">
-            <el-input v-model="form.cOpenId" placeholder="请输入用户openid" />
+          <el-form-item label="订单时间" prop="dtCreateTime">
+            <el-input v-model="form.dtCreateTime" placeholder="请输入用户openid" />
           </el-form-item>
-          <el-form-item label="订单明细" prop="cGoods">
-            <!-- <el-input v-model="form.cGoods" type="textarea" placeholder="请输入内容" /> -->
-            <div class="orderDetails" v-if="form.cGoods">
-                <!-- <div>订单名称：{{form.cGoods[0].cTitle  }}</div> -->
-                <el-form-item label="项目名称"> 
-                  <el-input v-model="form.cGoods[0].cTitle" placeholder="请输入订单金额" />
-                </el-form-item>
-                <el-form-item label="项目亮点">
-                  <el-input v-model="form.cGoods[0].cLdList" placeholder="请输入订单金额" />
-                </el-form-item>
-                <!-- <el-form-item label="订单详情">
-                  <el-input v-model="form.cGoods[0].cDetail" placeholder="请输入订单金额" />
-                </el-form-item> -->
-                <el-form-item label="适合人群">
-                  <el-input v-model="form.cGoods[0].cSyrq" type="textarea" placeholder="请输入订单金额" />
-                </el-form-item>
-                <el-form-item label="项目原价">
-                  <el-input v-model="form.cGoods[0].dYuanPrice" placeholder="请输入订单金额" />
-                </el-form-item>
-                <el-form-item label="项目折后价">
-                  <el-input v-model="form.cGoods[0].dPrice" placeholder="请输入订单金额" />
-                </el-form-item>
-                <el-form-item label="项目时长">
-                  <el-input v-model="form.cGoods[0].nMinute" placeholder="请输入订单金额" />
-                </el-form-item>
-                <el-form-item label="项目个数">
-                  <el-input v-model="form.cGoods[0].number" placeholder="请输入订单金额" />
-                </el-form-item>
-            </div>
+          <el-form-item label="用户姓名" prop="cName">
+            <el-input v-model="form.cName" placeholder="请输入姓名" />
+          </el-form-item>
+          <el-form-item label="用户电话" prop="cPhone">
+            <el-input v-model="form.cPhone" placeholder="请输入电话" />
+          </el-form-item>
+          <el-form-item label="技师姓名">
+            <el-input v-model="jsInfo.cName" placeholder="请输入姓名" />
+          </el-form-item>
+          <el-form-item label="技师电话">
+            <el-input v-model="jsInfo.cPhone" placeholder="请输入电话" />
           </el-form-item>
           <el-form-item label="订单金额" prop="dTotalMoney">
             <el-input v-model="form.dTotalMoney" placeholder="请输入订单金额" />
           </el-form-item>
-          <!-- <el-form-item label="地址" prop="cAddress">
-            <el-input v-model="form.cAddress" placeholder="请输入地址" />
-          </el-form-item> -->
-          <el-form-item label="姓名" prop="cName">
-            <el-input v-model="form.cName" placeholder="请输入姓名" />
-          </el-form-item>
-          <el-form-item label="电话" prop="cPhone">
-            <el-input v-model="form.cPhone" placeholder="请输入电话" />
+          <el-form-item label="地址" prop="cAddress">
+            <el-input type="textarea" v-model="form.cAddress" placeholder="请输入地址" />
           </el-form-item>
+          
           <el-form-item label="备注" prop="cNote">
             <el-input v-model="form.cNote" type="textarea" placeholder="请输入内容" />
           </el-form-item>
-          <el-form-item label="时间" prop="cTime">
+          <!-- <el-form-item label="时间" prop="cTime">
             <el-input v-model="form.cTime" placeholder="请输入时间" />
-          </el-form-item>
+          </el-form-item> -->
           <!-- <el-form-item label="推荐者id" prop="cTjOpenId">
             <el-input v-model="form.cTjOpenId" placeholder="请输入推荐者id" />
           </el-form-item> 
@@ -175,6 +153,43 @@
               placeholder="请选择创建时间">
             </el-date-picker>
           </el-form-item>-->
+          <el-form-item label="订单明细" prop="cGoods">
+            <!-- <el-input v-model="form.cGoods" type="textarea" placeholder="请输入内容" /> -->
+            <div v-for="(item,index) in form.cGoods" :key="index">
+              <div class="orderDetails">
+                <el-table
+                    :data="form.cGoods"
+                    style="width: 100%">
+                    <el-table-column
+                      prop="cTitle"
+                      label="标题">
+                    </el-table-column>
+                    <el-table-column label="封面图" align="center" prop="cCover" width="100">
+                      <template slot-scope="scope">
+                        <image-preview :src="scope.row.cCover" :width="50" :height="50"/>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      prop="cLdList"
+                      label="亮点">
+                    </el-table-column>
+                    <el-table-column
+                      prop="nMinute"
+                      label="时长">
+                    </el-table-column>
+                    <el-table-column
+                      prop="dPrice"
+                      label="价格">
+                    </el-table-column>
+                    <el-table-column
+                      prop="number"
+                      label="项目个数">
+                    </el-table-column>
+                  </el-table>
+              </div>
+            </div>
+            
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm" v-show="subShow">确 定</el-button>
@@ -243,6 +258,7 @@
         rules: {
         },
         detalis:'',
+        jsInfo:'',
       };
     },
     created() {
@@ -336,10 +352,14 @@
             cId : row.cId || this.ids
         }
         this.subShow = false;
-        getOrder(cId).then(response => {
-          this.form = response.data;
-          this.open = true;
+        this.open = true;
           this.title = "详情";
+        listOrder(cId).then(response => {
+          console.log(response.data.records,'order')
+          this.form = response.data.records[0];
+          this.form.cAddress = JSON.parse(response.data.records[0].cAddress).address + '(' + JSON.parse(response.data.records[0].cAddress).name +')' + response.data.records[0].atlasAdd
+
+          this.jsInfo =  response.data.records[0].js;
         });
       },
       /** 提交按钮 */