修改bug

src/setting.js

@@ -12,9 +12,9 @@ if (isDev) {
     // jumpPath = "http://39.108.250.202/judgmentPoint/";
     jumpPath = "http://192.168.31.254:8087/"; // 本地调试-需要启动本地判分点系统
 
-    host = "http://39.108.250.202:9000";
+    // host = "http://39.108.250.202:9000";
     // host = "http://39.108.250.202:9000";//线上
-    // host = 'http://192.168.31.151:9000'// 榕
+    host = 'http://192.168.31.151:9000'// 榕
     // host = 'http://192.168.31.125:9000'// 坤
     // host = 'http://192.168.31.137:9000'// 赓
 } else if (isTest) {

src/views/customer/AddCustomer.vue

@@ -579,22 +579,22 @@ export default {
                             this.$post(this.api.addCustomer,data).then((res) => {
                                 let customerId = res.customerId
                                 this.$store.commit('schoolIdData',{schoolId: this.form.schoolId})
-                                this.$post(this.api.saveOrUpdate,{
-                                    clientId: 0,
-                                    id: '',
-                                    roleName: '超级管理员',
-                                    remark: '拥有一切权限',
-                                    isPort: 2
-                                }).then(res => {
-                                    let roleId = res.roleId
-                                    let perData = {
-                                        roleId,
-                                        permissionId: ["1408370117262635009","1409351488911056897","1409351867862228993","1408370186435096578","1409352518310699009","1409352550615228418","1409352584240963585","1409352623344459778","1409352647054860289","1409352682471563266","1409352720786530305","1409352742290726913","1408370244584927233","1409352872662278146","1409352903574298626","1409352923509825538","1409352940068937730","1409353018443702273"],
-                                        isPort: 2
-                                    }
-                                    this.$post(this.api.doAssign,perData).then(res => {}).catch(res => {})
-                                    this.$post(`${this.api.updateCustomerByRoleId}?customerId=${customerId}&roleId=${roleId}`).then(res => {}).catch(res => {})
-                                }).catch(res => {})
+                                // this.$post(this.api.saveOrUpdate,{
+                                //     clientId: 0,
+                                //     id: '',
+                                //     roleName: '超级管理员',
+                                //     remark: '拥有一切权限',
+                                //     isPort: 2
+                                // }).then(res => {
+                                //     let roleId = res.roleId
+                                //     let perData = {
+                                //         roleId,
+                                //         permissionId: ["1408370117262635009","1409351488911056897","1409351867862228993","1408370186435096578","1409352518310699009","1409352550615228418","1409352584240963585","1409352623344459778","1409352647054860289","1409352682471563266","1409352720786530305","1409352742290726913","1408370244584927233","1409352872662278146","1409352903574298626","1409352923509825538","1409352940068937730","1409353018443702273"],
+                                //         isPort: 2
+                                //     }
+                                //     this.$post(this.api.doAssign,perData).then(res => {}).catch(res => {})
+                                //     this.$post(`${this.api.updateCustomerByRoleId}?customerId=${customerId}&roleId=${roleId}`).then(res => {}).catch(res => {})
+                                // }).catch(res => {})
 
                                 this.$message.success('添加成功')
                                 this.goback()

src/views/order/Order.vue

@@ -80,6 +80,14 @@
                         <el-table-column prop="customerName" label="客户名称" align="center">
                         </el-table-column>
                         <el-table-column prop="orderContent" label="订单内容" align="center">
+                            <template slot-scope="scope">
+                                <el-popover trigger="hover" placement="top" style='width: 500px'>
+                                    <p> {{ scope.row.orderContent }}</p>
+                                    <div slot="reference" class="name-wrapper">
+                                        <el-tag size="medium" class='tags'>{{ scope.row.orderContent }}</el-tag>
+                                    </div>
+                                </el-popover>
+                            </template>
                         </el-table-column>
                         <el-table-column prop="orderAmount" label="订单金额（元）" align="center">
                         </el-table-column>
@@ -292,5 +300,27 @@ export default {
 .mag {
     margin-right: 20px;
 }
+.cell{
+    white-space:pre-wrap;
+    width: 140px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+.tags{
+    border: none;
+    background: none;color: #000;
+    white-space:pre-wrap;
+    width: 140px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
 </style>
 

src/views/user/User.vue

@@ -52,11 +52,6 @@
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item>
-                                            <el-input placeholder="支持账号,手机号,姓名,学校查询" prefix-icon="el-icon-search" v-model="form.keyword" clearable></el-input>
-                                        </el-form-item>
-                                    </el-col>
                                     <!-- <el-col :span="5">
                                         <el-form-item label="角色">
                                             <el-select v-model="form.accountRole" clearable placeholder="请选择角色" @change="initData">
@@ -89,6 +84,11 @@
                                             ></el-date-picker>
                                         </el-form-item>
                                     </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item>
+                                            <el-input placeholder="支持账号,手机号,姓名,学校查询" prefix-icon="el-icon-search" v-model="form.keyword" clearable></el-input>
+                                        </el-form-item>
+                                    </el-col>
                                 </el-row>
 
                             </el-form>