提交自提点管理代码

package-lock.json

@@ -1929,6 +1929,17 @@
         "postcss-value-parser": "^4.1.0"
       }
     },
+    "avue-plugin-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/avue-plugin-map/-/avue-plugin-map-1.0.1.tgz",
+      "integrity": "sha512-QpGiCJZxF/DptoJrZnZWwQSxA2oBI7S8Wog3CEh9EhwrAKb+I0Ct8PWO+hBH2Q+tXTv/glhSWMh9aUbQa0/YIg==",
+      "requires": {
+        "axios": "^0.18.0",
+        "element-ui": "^2.4.6",
+        "vue": "^2.5.17",
+        "vue-router": "^3.0.1"
+      }
+    },
     "avue-plugin-ueditor": {
       "version": "0.1.7",
       "resolved": "https://registry.npmmirror.com/avue-plugin-ueditor/-/avue-plugin-ueditor-0.1.7.tgz",

package.json

@@ -13,6 +13,7 @@
     "build:prod": "vue-cli-service build"
   },
   "dependencies": {
+    "avue-plugin-map": "^1.0.1",
     "avue-plugin-ueditor": "^0.1.4",
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",

public/index.html

@@ -19,6 +19,8 @@
   <script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
   <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
   <script src="https://cdn.staticfile.org/Sortable/1.10.0-rc2/Sortable.min.js"></script>
+  <script src='http://webapi.amap.com/maps?v=1.4.11&key=7ab53b28352e55dc5754699add0ad862&plugin=AMap.PlaceSearch'></script>
+  <script src="http://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
   <link rel="icon" href="<%= BASE_URL %>favicon.png">
   <title>Saber企业级开发平台</title>
   <style>

src/main.js

@@ -24,11 +24,13 @@ import website from '@/config/website';
 import crudCommon from '@/mixins/crud';
 // 业务组件
 import tenantPackage from './views/system/tenantpackage';
+import AvueMap from 'avue-plugin-map'
 
 // 注册全局crud驱动
 window.$crudCommon = crudCommon;
 // 加载Vue拓展
 Vue.use(router);
+Vue.use(AvueMap);
 Vue.use(VueAxios, axios);
 Vue.use(Element, {
   i18n: (key, value) => i18n.t(key, value)

src/views/groupon/groupon.vue

@@ -52,7 +52,7 @@
       </template>
     </avue-crud>
 
-    <el-dialog title="商品审核" @close="refreshChange"
+    <el-dialog title="拼团审核" @close="refreshChange"
                append-to-body
                :visible.sync="auditBox"
                :before-close="handleClose"
@@ -211,12 +211,11 @@
               label: "状态",
               prop: "status",
               labelWidth: 120,
-              width: 80,
               search: true,
               slot:true,
               rules: [{
                 required: true,
-                message: "请输入是否上架",
+                message: "请选择状态",
                 trigger: "blur"
               }],
               type: "select",
@@ -229,7 +228,6 @@
             },
             {
               label: "审核状态",
-              width: 90,
               prop: "auditStatus",
               labelWidth: 120,
               addDisplay: false,

src/views/groupon/selftake.vue

@@ -1,5 +1,7 @@
 <template>
+
   <basic-container>
+
     <avue-crud :option="option"
                :table-loading="loading"
                :data="data"
@@ -18,14 +20,14 @@
                @size-change="sizeChange"
                @refresh-change="refreshChange"
                @on-load="onLoad">
+
+      <template slot="status" slot-scope="scope" >
+        <el-tag v-if="scope.row.status === 1" type="success">{{scope.row.$status}}</el-tag>
+        <el-tag v-if="scope.row.status === 0" type="danger">{{scope.row.$status}}</el-tag>
+      </template>
+
       <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.selftake_delete"
-                   @click="handleDelete">删 除
-        </el-button>
+
       </template>
     </avue-crud>
   </basic-container>
@@ -38,6 +40,12 @@
   export default {
     data() {
       return {
+        //初始化坐标
+        lnglat: {
+          P: 36.71292016263102,
+          R: 119.05866949215533
+        },
+        text:{},
         form: {},
         query: {},
         loading: true,
@@ -56,12 +64,19 @@
           border: true,
           index: true,
           viewBtn: true,
+          delBtn: false,
           selection: true,
           dialogClickModal: false,
           column: [
             {
-              label: "自提点名字",
+              label:'test',
+              prop:'test',
+              component: "avueMap"
+            },
+            {
+              label: "名称",
               prop: "name",
+              labelWidth: 120,
               rules: [{
                 required: true,
                 message: "请输入自提点名字",
@@ -69,8 +84,9 @@
               }]
             },
             {
-              label: "自提点地址",
+              label: "地址",
               prop: "address",
+              labelWidth: 120,
               rules: [{
                 required: true,
                 message: "请输入自提点地址",
@@ -80,6 +96,7 @@
             {
               label: "经度",
               prop: "longitude",
+              labelWidth: 120,
               rules: [{
                 required: true,
                 message: "请输入经度",
@@ -88,6 +105,7 @@
             },
             {
               label: "纬度",
+              labelWidth: 120,
               prop: "latitude",
               rules: [{
                 required: true,
@@ -98,6 +116,13 @@
             {
               label: "营业开始时间",
               prop: "busStartTime",
+              labelWidth: 120,
+              type: "time",
+              pickerOptions:{
+                start: '08:00',
+                step: '00:15',
+                end: '22:00'
+              },
               rules: [{
                 required: true,
                 message: "请输入营业开始时间",
@@ -107,29 +132,37 @@
             {
               label: "营业结束时间",
               prop: "busEndTime",
+              labelWidth: 120,
+              type: "time",
+              pickerOptions:{
+                start: '08:00',
+                step: '00:15',
+                end: '22:00'
+              },
               rules: [{
                 required: true,
                 message: "请输入营业结束时间",
                 trigger: "blur"
               }]
             },
-            {
-              label: "来源 1-平台 2-用户",
-              prop: "source",
-              rules: [{
-                required: true,
-                message: "请输入来源 1-平台 2-用户",
-                trigger: "blur"
-              }]
-            },
             {
               label: "状态",
               prop: "status",
+              labelWidth: 120,
               rules: [{
                 required: true,
                 message: "请输入状态",
                 trigger: "blur"
-              }]
+              }],
+              search: true,
+              slot:true,
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=StatusEnum",
+              props: {
+                label: "name",
+                value: "value"
+              },
+              dataType: "number",
             },
           ]
         },