From fd39ea8b2f09ce95f5946370d9d9fc64e17bf9ed Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Wed, 21 Apr 2021 15:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E7=BC=96=E8=BE=91=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=85=BE=E8=AE=AF=E5=9C=B0=E5=9B=BE=E5=BA=A7?=
 =?UTF-8?q?=E6=A0=87=E7=9A=84=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/map.ts                       |  10 ++
 src/api/shop.ts                      |   1 +
 src/api/types.d.ts                   |   8 +-
 src/components/UploadImage/index.vue |  45 ++---
 src/router/modules/marketing.ts      |  20 +--
 src/views/marketing/points.vue       | 258 +++++++++++----------------
 src/views/shop/edit.vue              |  65 ++++++-
 7 files changed, 217 insertions(+), 190 deletions(-)

diff --git a/src/api/map.ts b/src/api/map.ts
index 1147615..98e6697 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -9,3 +9,13 @@ export async function queryArea(str: string, region: string) {
   })
 
 }
+
+export async function addressToLoc(address: string) {
+  let data = { address }
+  return request({
+    url: '/area/geocoder',
+    method: 'post',
+    data
+  })
+
+}
diff --git a/src/api/shop.ts b/src/api/shop.ts
index 24bf9be..a77e3df 100644
--- a/src/api/shop.ts
+++ b/src/api/shop.ts
@@ -5,6 +5,7 @@ export const defaultShopData: IShopData = {
   name: '',
   _id: '',
   address: '',
+  logo: ''
 }
 
 export const getShops = (params: any) =>
diff --git a/src/api/types.d.ts b/src/api/types.d.ts
index fb4ec46..2e389b9 100644
--- a/src/api/types.d.ts
+++ b/src/api/types.d.ts
@@ -47,5 +47,11 @@ export interface IShopData {
   createdAt?: Date,
   areaCode?: number,
   areaStr?: string,
-  address: string
+  address: string,
+  logo?: string,
+  lng?: number,
+  lat?: number,
+  showName?: string,
+  extData?: string,
+  category?: string
 }
diff --git a/src/components/UploadImage/index.vue b/src/components/UploadImage/index.vue
index 2a1054e..3c3d10d 100644
--- a/src/components/UploadImage/index.vue
+++ b/src/components/UploadImage/index.vue
@@ -2,32 +2,33 @@
   <div class="upload-container">
     <el-upload
       :data="dataObj"
-      :multiple="false"
+      name="image-file"
+      :multiple="true"
       :show-file-list="false"
       :on-success="handleImageSuccess"
       class="image-uploader"
       drag
-      action="https://httpbin.org/post"
+      :action="uploadUrl"
     >
       <i class="el-icon-upload" />
       <div class="el-upload__text">
         将文件拖到此处，或<em>点击上传</em>
       </div>
     </el-upload>
-    <div class="image-preview image-app-preview">
-      <div
-        v-show="imageUrl.length>1"
-        class="image-preview-wrapper"
-      >
-        <img :src="imageUrl">
-        <div class="image-preview-action">
-          <i
-            class="el-icon-delete"
-            @click="rmImage"
-          />
-        </div>
-      </div>
-    </div>
+<!--    <div class="image-preview image-app-preview">-->
+<!--      <div-->
+<!--        v-show="imageUrl.length>1"-->
+<!--        class="image-preview-wrapper"-->
+<!--      >-->
+<!--        <img :src="imageUrl">-->
+<!--        <div class="image-preview-action">-->
+<!--          <i-->
+<!--            class="el-icon-delete"-->
+<!--            @click="rmImage"-->
+<!--          />-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
     <div class="image-preview">
       <div
         v-show="imageUrl.length>1"
@@ -54,8 +55,11 @@ import { Component, Prop, Vue } from 'vue-property-decorator'
 export default class extends Vue {
   @Prop({ default: '' }) private value!: string
 
+  private uploadUrl = 'https://opm.kingsome.cn/api/upload'
+  // private uploadUrl = 'http://127.0.0.1:4000/api/upload'
+
   private tempUrl = ''
-  private dataObj = { token: '', key: '' }
+  private dataObj = { sub_path: 'game', type: 'image' }
 
   get imageUrl() {
     return this.value
@@ -70,7 +74,8 @@ export default class extends Vue {
   }
 
   private handleImageSuccess(res: any) {
-    this.emitInput(res.files.file)
+    console.log(res)
+    this.emitInput(res.url_cdn)
   }
 }
 </script>
@@ -88,7 +93,6 @@ export default class extends Vue {
 
   .image-preview {
     width: 200px;
-    height: 200px;
     position: relative;
     border: 1px dashed #d9d9d9;
     float: left;
@@ -97,18 +101,15 @@ export default class extends Vue {
     .image-preview-wrapper {
       position: relative;
       width: 100%;
-      height: 100%;
 
       img {
         width: 100%;
-        height: 100%;
       }
     }
 
     .image-preview-action {
       position: absolute;
       width: 100%;
-      height: 100%;
       left: 0;
       top: 0;
       cursor: default;
diff --git a/src/router/modules/marketing.ts b/src/router/modules/marketing.ts
index 72df80c..c4b0856 100644
--- a/src/router/modules/marketing.ts
+++ b/src/router/modules/marketing.ts
@@ -30,16 +30,16 @@ const marketingRoutes: RouteConfig = {
         icon: 'promo'
       }
     },
-    // {
-    //   path: 'points',
-    //   component: () => import('@/views/marketing/points.vue'),
-    //   name: 'PointsSetting',
-    //   meta: {
-    //     title: 'marketing_points',
-    //     permissions: ['points:read'],
-    //     icon: 'points'
-    //   }
-    // }
+    {
+      path: 'points',
+      component: () => import('@/views/marketing/points.vue'),
+      name: 'PointsSetting',
+      meta: {
+        title: 'marketing_points',
+        permissions: ['points:read'],
+        icon: 'points'
+      }
+    }
   ]
 }
 
diff --git a/src/views/marketing/points.vue b/src/views/marketing/points.vue
index 96f461d..fdcbaea 100644
--- a/src/views/marketing/points.vue
+++ b/src/views/marketing/points.vue
@@ -1,187 +1,135 @@
 <template>
   <div class="app-container">
-    <!-- filter -->
-    <el-form ref="filterForm" :inline="true" :model="filterForm" class="filter">
-      <el-form-item label="关键字" prop="key">
-        <el-input v-model="filterForm.key" placeholder="关键字"/>
+    <el-form
+        ref="form"
+        :model="form"
+        label-width="120px"
+    >
+      <el-form-item label="Activity name">
+        <el-input v-model="form.name" />
       </el-form-item>
-      <el-form-item label="店铺">
+      <el-form-item label="Activity zone">
         <el-select
-            v-model="filterForm.department"
-            placeholder="所有"
-            class="w100"
+            v-model="form.region"
+            placeholder="please select your zone"
         >
-          <el-option value="">所有</el-option>
           <el-option
-              v-for="item in allDepts"
-              :key="item._id"
-              :label="item.name"
-              :value="item._id"
+              label="Zone one"
+              value="shanghai"
+          />
+          <el-option
+              label="Zone two"
+              value="beijing"
           />
         </el-select>
       </el-form-item>
-
+      <el-form-item label="Activity time">
+        <el-col :span="11">
+          <el-date-picker
+              v-model="form.date1"
+              type="date"
+              placeholder="Pick a date"
+              style="width: 100%;"
+          />
+        </el-col>
+        <el-col
+            :span="2"
+            class="line"
+        >
+          -
+        </el-col>
+        <el-col :span="11">
+          <el-time-picker
+              v-model="form.date2"
+              type="fixed-time"
+              placeholder="Pick a time"
+              style="width: 100%;"
+          />
+        </el-col>
+      </el-form-item>
+      <el-form-item label="Instant delivery">
+        <el-switch v-model="form.delivery" />
+      </el-form-item>
+      <el-form-item label="Activity type">
+        <el-checkbox-group v-model="form.type">
+          <el-checkbox
+              label="Online activities"
+              name="type"
+          />
+          <el-checkbox
+              label="Promotion activities"
+              name="type"
+          />
+          <el-checkbox
+              label="Offline activities"
+              name="type"
+          />
+          <el-checkbox
+              label="Simple brand exposure"
+              name="type"
+          />
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item label="Resources">
+        <el-radio-group v-model="form.resource">
+          <el-radio label="Sponsor" />
+          <el-radio label="Venue" />
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="Activity form">
+        <el-input
+            v-model="form.desc"
+            type="textarea"
+        />
+      </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="search">查询</el-button>
-        <el-button @click="resetFilterForm">重置</el-button>
+        <el-button
+            type="primary"
+            @click="onSubmit"
+        >
+          Create
+        </el-button>
+        <el-button @click="onCancel">
+          Cancel
+        </el-button>
       </el-form-item>
     </el-form>
-    <router-link to="/system/create">
-      <el-button
-          type="primary"
-          icon="el-icon-edit"
-      >
-        添加
-      </el-button>
-    </router-link>
-    <el-table
-        v-loading="listLoading"
-        :data="list"
-        border
-        fit
-        highlight-current-row
-        style="width: 100%;margin-top:30px;"
-    >
-      <el-table-column
-          width="180px"
-          align="center"
-          label="添加时间"
-      >
-        <template slot-scope="{row}">
-          <span>{{ row.createdAt | parseTime }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column
-          align="center"
-          label="操作"
-      >
-        <template slot-scope="scope">
-          <router-link :to="'/system/edit/'+scope.row._id">
-            <el-button
-                type="primary"
-                size="small"
-                icon="el-icon-edit"
-            >
-              编辑
-            </el-button>
-          </router-link>
-          <el-button
-              type="danger"
-              size="small"
-              style="margin-left: 10px"
-              @click="handleDelete(scope)"
-          >
-            {{ $t('permission.delete') }}
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="listQuery.page"
-        :limit.sync="listQuery.limit"
-        @pagination="getList"
-    />
   </div>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator'
-import { IShopData } from '@/api/types'
-import Pagination from '@/components/Pagination/index.vue'
-import { deleteShop, getShops } from '@/api/shop'
-import { parseTime } from '@/utils'
-import { Form } from 'element-ui'
 
 @Component({
-  name: 'PointsList',
-  components: {
-    Pagination
-  },
-  filters: {
-    parseTime: (timestamp: string) => {
-      return parseTime(timestamp)
-    }
-  }
+  name: 'PointsView'
 })
-
 export default class extends Vue {
-  private total = 0
-  private list: IShopData[] = []
-  private listLoading = true
-  private allDepts = []
-  private listQuery = {
-    page: 1,
-    limit: 20,
-    key: ''
-  }
-  private filterForm = {
-    key: ''
+  private form = {
+    name: '',
+    region: '',
+    date1: '',
+    date2: '',
+    delivery: false,
+    type: [],
+    resource: '',
+    desc: ''
+  };
+
+  private onSubmit() {
+    this.$message('submit!')
   }
 
-  created() {
-    this.getList()
-    this.getRemoteDeptList()
-  }
-
-
-  private async getList() {
-    this.listLoading = true
-    const { data } = await getShops(this.listQuery)
-    this.listLoading = false
-    this.list = data.records
-    this.total = data.total
-  }
-  private async handleDelete(scope: any) {
-    const { $index, row } = scope
-    await this.$confirm('确认删除该店铺?', 'Warning', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
+  private onCancel() {
+    this.$message({
+      message: 'cancel!',
       type: 'warning'
     })
-    await deleteShop(row._id)
-    this.list.splice($index, 1)
-    this.$message({
-      type: 'success',
-      message: '删除成功!'
-    })
   }
-
-  private search() {
-    this.filterData()
-  }
-
-  private filterData() {
-    this.listQuery.key = this.filterForm.key
-    this.listQuery.page = 1
-    this.getList()
-  }
-
-  private resetFilterForm() {
-    const ref = <Form>this.$refs.filterForm
-    ref.resetFields()
-  }
-  private async getRemoteDeptList(name: string) {
-    const { data } = await getShops({ key: name })
-    if (!data.records) return
-    this.allDepts = data.records
-  }
-
 }
 </script>
 
 <style lang="scss" scoped>
-.edit-input {
-  padding-right: 100px;
+.line {
+  text-align: center;
 }
-
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-
 </style>
diff --git a/src/views/shop/edit.vue b/src/views/shop/edit.vue
index 4a676d2..3d54df1 100644
--- a/src/views/shop/edit.vue
+++ b/src/views/shop/edit.vue
@@ -8,7 +8,6 @@
         class="form-container"
     >
       <el-form-item
-
           label="店铺名"
       >
         <el-select
@@ -30,6 +29,27 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item
+          label="显示名"
+          prop="showName"
+      >
+        <el-input
+            v-model="postForm.showName"
+            name="showName"
+            style="width: 50%"
+            required
+        />
+      </el-form-item>
+      <el-form-item
+          label="类别"
+          prop="category"
+      >
+        <el-input
+            v-model="postForm.category"
+            name="category"
+            style="width: 50%"
+        />
+      </el-form-item>
       <el-form-item
           label="区域"
       >
@@ -49,6 +69,25 @@
             required
         />
       </el-form-item>
+      <el-form-item
+          label="座标点"
+          prop="lng"
+      >
+        {{postForm.lat}} - {{postForm.lng}}
+        <el-button
+            type="success"
+            v-loading="querying"
+            @click="updateLoc"
+        >
+          更新座标
+        </el-button>
+      </el-form-item>
+      <el-form-item
+          prop="imageURL"
+          label="logo"
+      >
+        <upload-image v-model="postForm.logo" />
+      </el-form-item>
       <el-form-item>
         <el-button
             type="primary"
@@ -74,7 +113,7 @@ import UploadImage from '@/components/UploadImage/index.vue'
 import RegionPicker from '@/components/RegionPicker/index.vue'
 import { Form } from 'element-ui'
 import { defaultShopData, getShop, saveShop } from '@/api/shop'
-import { queryArea } from '@/api/map'
+import { addressToLoc, queryArea } from '@/api/map'
 
 @Component({
   name: 'ShopEditor',
@@ -109,6 +148,7 @@ export default class extends Vue {
 
   private postForm = Object.assign({}, defaultShopData)
   private loading = false
+  private querying = false
   private rules = {
     name: [{ validator: this.validateRequire }],
   }
@@ -230,7 +270,28 @@ export default class extends Vue {
     console.log(result)
     if (result) {
       this.postForm.address = result.address
+      this.postForm.showName = this.postForm.name
       this.postForm.areaCode = result.adcode
+      this.postForm.areaStr = `${result.province}-${result.city}-${result.district}`
+      this.postForm.extData = result.id
+      this.postForm.category = result.category
+      if (result.location) {
+        this.postForm.lat = result.location.lat
+        this.postForm.lng = result.location.lng
+      }
+    }
+  }
+  private async updateLoc() {
+    if (!this.postForm.address) {
+      return
+    }
+    this.querying = true
+    let {data} = await addressToLoc(this.postForm.address)
+    console.log(data)
+    this.querying = false
+    if (data.location) {
+      this.postForm.lat = data.location.lat
+      this.postForm.lng = data.location.lng
     }
   }