achao 2 years ago
parent
commit
d2ef06f026

+ 5 - 5
unimall-admin/config/prod.env.js

@@ -1,6 +1,6 @@
 module.exports = {
-	NODE_ENV: '"production"',
-  	ENV_CONFIG: '"prod"',
-    HOST: '"http://106.14.75.12:8181"',
-    BASE_API: '"http://106.14.75.12:8181/m.api"'
-}
+    NODE_ENV: '"production"',
+    ENV_CONFIG: '"prod"',
+    HOST: '"https://shiyaopinche.cspc.cn"',
+    BASE_API: '"https://shiyaopinche.cspc.cn/m.api"'
+}

+ 1 - 24
unimall-admin/src/router/route.json

@@ -1,27 +1,4 @@
-[
-
-    {
-        "redirect": "noredirect",
-        "path": "/tools1",
-        "children": [{
-            "path": "generator",
-            "meta": {
-                "noCache": true,
-                "perms": [
-                    ""
-                ],
-                "title": "代码生成器"
-            },
-            "name": "tools",
-            "page": "/tools/gen"
-        }],
-        "meta": {
-            "icon": "tools",
-            "title": "实用工具"
-        },
-        "name": "toolsManage",
-        "alwaysShow": true
-    }, {
+[{
         "redirect": "noredirect",
         "name": "appointment",
         "path": "/appointment",

+ 14 - 14
unimall-admin/src/views/appointment/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
+    <!-- <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
       <el-form-item label="" prop="companyId">
         <el-input
           v-model="queryParams.companyId"
@@ -171,7 +171,7 @@
         <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-form> -->
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -203,7 +203,7 @@
           @click="handleDelete"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           v-permission="['unimall:appointment:export']"
           type="warning"
@@ -211,21 +211,21 @@
           size="mini"
           @click="handleExport"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table v-loading="loading" :data="appointmentList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
-      <el-table-column label="" align="center" prop="companyId" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <!-- <el-table-column label="" align="center" prop="id" /> -->
+      <!-- <el-table-column label="" align="center" prop="companyId" /> -->
       <el-table-column label="预约人" align="center" prop="appointedBy" />
       <el-table-column label="拼车类型" align="center" prop="carpoolingType" />
       <el-table-column label="路线" align="center" prop="route" />
       <el-table-column label="手机号" align="center" prop="phone" />
       <el-table-column label="出发地点" align="center" prop="startPlace" />
       <el-table-column label="到达地点" align="center" prop="endPlace" />
-      <el-table-column label="出发经纬度" align="center" prop="departureLatitude" />
-      <el-table-column label="到达经纬度" align="center" prop="latitudeArrival" />
+      <!-- <el-table-column label="出发经纬度" align="center" prop="departureLatitude" />
+      <el-table-column label="到达经纬度" align="center" prop="latitudeArrival" /> -->
       <el-table-column label="出发时间" align="center" prop="departureTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.departureTime) }}</span>
@@ -236,11 +236,11 @@
       <el-table-column label="单价" align="center" prop="unitPrice" />
       <el-table-column label="总价" align="center" prop="price" />
       <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="备注1" align="center" prop="remark1" />
+      <!-- <el-table-column label="备注1" align="center" prop="remark1" />
       <el-table-column label="备注2" align="center" prop="remark2" />
-      <el-table-column label="备注3" align="center" prop="remark3" />
-      <el-table-column label="0:否" align="center" prop="deleteFlag" />
-      <el-table-column label="" align="center" prop="gmtCreate" width="180">
+      <el-table-column label="备注3" align="center" prop="remark3" /> -->
+      <!-- <el-table-column label="0:否" align="center" prop="deleteFlag" /> -->
+      <!-- <el-table-column label="" align="center" prop="gmtCreate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.gmtCreate) }}</span>
         </template>
@@ -251,7 +251,7 @@
         </template>
       </el-table-column>
       <el-table-column label="" align="center" prop="userId" />
-      <el-table-column label="" align="center" prop="adminId" />
+      <el-table-column label="" align="center" prop="adminId" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

+ 1 - 1
unimall-admin/src/views/login/index.vue

@@ -11,7 +11,7 @@
           class="img"
           src="@/assets/avatar.png"
           alt="">
-        <p class="title">电商后台登录</p>
+        <p class="title">拼车后台登录</p>
       </div>
       <div class="login-border">
         <div class="login-main">

+ 7 - 7
unimall-admin/src/views/price/index.vue

@@ -128,9 +128,9 @@
       <el-table-column label="" align="center" prop="companyId" /> -->
       <el-table-column label="路线" align="center" prop="route" />
       <el-table-column label="单价" align="center" prop="unitPrice" />
-      <el-table-column label="备注1" align="center" prop="remark1" />
+      <!-- <el-table-column label="备注1" align="center" prop="remark1" />
       <el-table-column label="备注2" align="center" prop="remark2" />
-      <el-table-column label="备注3" align="center" prop="remark3" />
+      <el-table-column label="备注3" align="center" prop="remark3" /> -->
       <!-- <el-table-column label="0:否" align="center" prop="deleteFlag" /> -->
       <!-- <el-table-column label="" align="center" prop="gmtCreate" width="180">
         <template slot-scope="scope">
@@ -189,7 +189,7 @@
           prop="unitPrice">
           <el-input v-model="form.unitPrice" placeholder="请输入金额" />
         </el-input></el-form-item>
-        <el-form-item label="备注1" prop="remark1">
+      <!-- <el-form-item label="备注1" prop="remark1">
           <el-input v-model="form.remark1" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="备注2" prop="remark2">
@@ -197,11 +197,11 @@
         </el-form-item>
         <el-form-item label="备注3" prop="remark3">
           <el-input v-model="form.remark3" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <!-- <el-form-item label="0:否" prop="deleteFlag">
+        </el-form-item> -->
+      <!-- <el-form-item label="0:否" prop="deleteFlag">
           <el-input v-model="form.deleteFlag" placeholder="请输入0:否" />
         </el-form-item> -->
-        <!-- <el-form-item label="" prop="gmtCreate">
+      <!-- <el-form-item label="" prop="gmtCreate">
           <el-date-picker
             v-model="form.gmtCreate"
             clearable
@@ -211,7 +211,7 @@
             value-format="yyyy-MM-dd"
             placeholder="选择"/>
         </el-form-item> -->
-        <!-- <el-form-item label="" prop="gmtUpdate">
+      <!-- <el-form-item label="" prop="gmtUpdate">
           <el-date-picker
             v-model="form.gmtUpdate"
             clearable

+ 12 - 12
unimall-admin/src/views/sharing/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
+    <!-- <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
       <el-form-item label="" prop="companyId">
         <el-input
           v-model="queryParams.companyId"
@@ -162,7 +162,7 @@
         <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-form> -->
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -194,7 +194,7 @@
           @click="handleDelete"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           v-permission="['unimall:sharing:export']"
           type="warning"
@@ -202,20 +202,20 @@
           size="mini"
           @click="handleExport"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table v-loading="loading" :data="sharingList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="" align="center" prop="id" />
-      <el-table-column label="" align="center" prop="companyId" />
+      <el-table-column label="" align="center" prop="companyId" /> -->
       <el-table-column label="拼车类型" align="center" prop="carpoolingType" />
       <el-table-column label="路线" align="center" prop="route" />
       <el-table-column label="手机号" align="center" prop="phone" />
       <el-table-column label="出发地点" align="center" prop="startPlace" />
       <el-table-column label="到达地点" align="center" prop="endPlace" />
-      <el-table-column label="出发经纬度" align="center" prop="departureLatitude" />
-      <el-table-column label="到达经纬度" align="center" prop="latitudeArrival" />
+      <!-- <el-table-column label="出发经纬度" align="center" prop="departureLatitude" />
+      <el-table-column label="到达经纬度" align="center" prop="latitudeArrival" /> -->
       <el-table-column label="出发时间" align="center" prop="departureTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.departureTime) }}</span>
@@ -226,10 +226,10 @@
       <el-table-column label="单价" align="center" prop="unitPrice" />
       <el-table-column label="总价" align="center" prop="price" />
       <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="备注1" align="center" prop="remark1" />
+      <!-- <el-table-column label="备注1" align="center" prop="remark1" />
       <el-table-column label="备注2" align="center" prop="remark2" />
-      <el-table-column label="备注3" align="center" prop="remark3" />
-      <el-table-column label="0:否" align="center" prop="deleteFlag" />
+      <el-table-column label="备注3" align="center" prop="remark3" /> -->
+      <!-- <el-table-column label="0:否" align="center" prop="deleteFlag" />
       <el-table-column label="" align="center" prop="gmtCreate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.gmtCreate) }}</span>
@@ -241,7 +241,7 @@
         </template>
       </el-table-column>
       <el-table-column label="" align="center" prop="userId" />
-      <el-table-column label="" align="center" prop="adminId" />
+      <el-table-column label="" align="center" prop="adminId" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button