From 9778a247a85ec85eeef3048394acece8ab88d6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Mon, 12 Dec 2022 16:46:50 +0800
Subject: [PATCH] up

---
 src/api/order/index.js                        |  11 +-
 src/views/business/merchantManage.vue         |  10 +-
 src/views/business/storeManage.vue            |  11 +-
 src/views/order/component/orderEdit.vue       | 107 ++++++++++++++++--
 src/views/order/orderList.vue                 |  22 +++-
 .../productService/productServiceManage.vue   |  14 ++-
 src/views/userManage/memberManage.vue         |  11 +-
 7 files changed, 165 insertions(+), 21 deletions(-)

diff --git a/src/api/order/index.js b/src/api/order/index.js
index 62c9bd1..632fcd8 100644
--- a/src/api/order/index.js
+++ b/src/api/order/index.js
@@ -16,6 +16,16 @@ export function getList(params){
   })
 }
 
+
+
+export function getDetail(params){
+  return request({
+    method:'get',
+    url:'/api/admin/order/show',
+    params
+  })
+}
+
 export function itemPreAction(params){
   return request({
     method:'get',
@@ -71,4 +81,3 @@ export function save(data){
     data
   })
 }
-
diff --git a/src/views/business/merchantManage.vue b/src/views/business/merchantManage.vue
index 74497ef..12b9a64 100644
--- a/src/views/business/merchantManage.vue
+++ b/src/views/business/merchantManage.vue
@@ -17,7 +17,7 @@
       :list="list"
       :table-item="tableItem"
       :total="total"
-      @pageSizeChange="select.pageSize = $event"
+      @pageSizeChange="pageSizeChange"
       @pageIndexChange="pageChange"
       @editor="editorShow"
       @delete="deleteMerchant">
@@ -123,6 +123,14 @@ export default {
     }
   },
   methods: {
+    pageSizeChange(e){
+      this.select.pageSize = e
+      this.doSearch();
+    },
+    doSearch(){
+       this.select.pageIndex = 1
+       this.getMerchant()
+    },
     pageChange(e){
       this.select.pageIndex = e
       this.getMerchant()
diff --git a/src/views/business/storeManage.vue b/src/views/business/storeManage.vue
index 2912cf0..a00e9fe 100644
--- a/src/views/business/storeManage.vue
+++ b/src/views/business/storeManage.vue
@@ -13,7 +13,7 @@
       </lx-header>
     </div>
 
-    <xy-table :total="total" @pageSizeChange="e => select.pageSize = e" @pageIndexChange="pageChange" :list="list" :table-item="tableItem" @delete="deleteStore" @editor="editorStore"></xy-table>
+    <xy-table :total="total" @pageSizeChange="pageSizeChange" @pageIndexChange="pageChange" :list="list" :table-item="tableItem" @delete="deleteStore" @editor="editorStore"></xy-table>
 
 <!--    新增门店-->
     <add-store ref="addStore" @refresh="getStores"></add-store>
@@ -96,6 +96,15 @@ export default {
     }
   },
   methods: {
+    pageSizeChange(e){
+
+         this.select.pageSize = e
+      this.doSearch();
+    },
+    doSearch(){
+       this.select.pageIndex = 1
+       this.getStores()
+    },
     async getStores(){
       const res = await index({
         page_size:this.select.pageSize,
diff --git a/src/views/order/component/orderEdit.vue b/src/views/order/component/orderEdit.vue
index fc83980..3d06b4b 100644
--- a/src/views/order/component/orderEdit.vue
+++ b/src/views/order/component/orderEdit.vue
@@ -1,29 +1,50 @@
 <template>
   <div>
-    <xy-dialog :is-show.sync="isShow"   type="form" title="商户简介" ok-text="保存" @on-ok="submit">
-      <template v-slot:name>
-        <div class="xy-table-item">
+
+    <Modal :width="60" title="订单修改" :value.sync="isShow" @on-visible-change="$emit('update:isShow',$event)"
+      @on-ok="submit">
+      <div class="xy-table-item" style="margin-bottom: 20px;">
+        <div class="xy-table-item-label">订单名称：
+        </div>
+        <div class="xy-table-item-content">
+          {{detail.name}}
+        </div>
+      </div>
+      <div style="display: flex;flex-wrap: wrap">
+        <div class="xy-table-item" style="margin-bottom: 20px;">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>产品名称：
+            地理位置选择
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.name" placeholder="请输入会所名称" clearable style="width: 300px;"></el-input>
+            <avue-input-map style="width: 300px;" :params="option" placeholder="请选择地图" v-model="map"></avue-input-map>
           </div>
         </div>
-      </template>
 
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>具体地址：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input clearable placeholder="请填写具体地址到楼层" v-model="form.member_address" style="width: 300px;" />
+          </div>
+        </div>
+      </div>
 
-    </xy-dialog>
+    </Modal>
   </div>
 </template>
 
 <script>
   import {
-    save
+    save,
+    getDetail
   } from "@/api/order"
   import {
     parseTime
   } from '@/utils'
+  import {
+    Message
+  } from "view-design"
 
   export default {
     props: {
@@ -35,19 +56,85 @@
     },
     data() {
       return {
+        map: {
 
+        },
+
+        option: {
+          column: [{
+            label: '坐标',
+            prop: 'map',
+            type: 'map',
+            //高德初始化参数
+            params: {
+              zoom: 10,
+              // zoomEnable: false,
+              // dragEnable: false,
+            }
+          }]
+        },
+        detail: {
+          name: "",
+        },
+        form: {
+          lat: "",
+          lng: "",
+          id: "",
+          member_address: ""
+        }
       }
     },
     methods: {
       submit() {
-
+        if (this.form.lat == "") {
+          Message({
+            type: 'error',
+            message: '请设置经纬度'
+          })
+          return false;
+        }
+        if (this.form.member_address == "") {
+          Message({
+            type: 'error',
+            message: '请填写服务地址'
+          })
+          return false;
+        }
+        save(this.form).then(res => {
+          this.$emit('refresh')
+          Message({
+            type: 'success',
+            message: '编辑成功'
+          })
+          this.isShow = false;
+          this.form.lat = "";
+          this.form.lng = "";
+          this.form.member_address = "";
+          this.map = [];
+        })
 
       }
     },
     watch: {
+      map(newVal) {
+        if (!newVal) return
+        this.form.lat = newVal[1]
+        this.form.lng = newVal[0]
+        //this.form.member_address = newVal[2]
+      },
       isShow(newVal) {
         if (newVal) {
-
+          this.form.id = this.id;
+          this.form.lat = "";
+          this.form.lng = "";
+          this.form.member_address = "";
+          this.map = {};
+          getDetail({
+            id: this.id
+          }).then(res => {
+            this.detail.name = res.order_name
+            this.form.member_address =res.member_address
+          })
         }
       }
     }
diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue
index 00ee032..6c9632c 100644
--- a/src/views/order/orderList.vue
+++ b/src/views/order/orderList.vue
@@ -133,6 +133,7 @@
     </xy-table>
 
     <orderLog :id="selectId" :is-show.sync="isShowLog" @refresh="getOrders"></orderLog>
+    <orderEdit :id="selectId" :is-show.sync="isShowEdit" @refresh="getOrders"></orderEdit>
   </div>
 </template>
 
@@ -150,16 +151,19 @@
 
   import orderLog from '@/views/order/component/orderLog'
   import actions from '@/views/order/component/actions'
+  import orderEdit from '@/views/order/component/orderEdit'
+
   export default {
     components: {
       orderLog,
-      actions
+      actions,
+      orderEdit
     },
     data() {
       return {
         selectId: null,
         isShowLog: false,
-
+        isShowEdit: false,
         merchants: [],
         orderItemStates: [],
         orderStates: [],
@@ -273,7 +277,7 @@
             width: 220,
             align: "left",
             customFn: (row) => {
-              return ( < div style = {
+              return ( <div style = {
                   {
                     display: 'flex',
                     alignItems: 'center',
@@ -281,9 +285,17 @@
                     cursor: 'pointer',
                     color: "blue"
                   }
-                } > {
+                }
+                on={{
+                  ['click']:(e)=>{
+                    this.selectId=row.order.id;
+                    this.isShowEdit=true;
+                  }
+                }}
+
+                > {
                   row.order.member_address ? row.order.member_address : "修改服务地址"
-                } < /div > )
+                } </div> )
               }
             },
             {
diff --git a/src/views/productService/productServiceManage.vue b/src/views/productService/productServiceManage.vue
index 829c3b4..b9cb1ae 100644
--- a/src/views/productService/productServiceManage.vue
+++ b/src/views/productService/productServiceManage.vue
@@ -97,7 +97,7 @@
       </lx-header>
     </div>
 
-    <xy-table :total="total" :list="list" :table-item="table" @pageSizeChange="e => select.pageSize = e" @pageIndexChange="pageChange">
+    <xy-table :total="total" :list="list" :table-item="table"  @pageSizeChange="pageSizeChange" @pageIndexChange="pageChange">
       <template v-slot:btns>
         <el-table-column fixed="right" label="操作" width="230" header-align="center">
           <template slot-scope="scope">
@@ -224,6 +224,16 @@ export default {
     }
   },
   methods: {
+    pageSizeChange(e){
+      this.select.pageSize=e;
+this.searchProducts();
+    },
+
+    searchProducts(){
+
+        this.select.pageIndex = 1
+        this.getProducts()
+    },
     pageChange(e){
       this.select.pageIndex = e
       this.getProducts()
@@ -251,7 +261,7 @@ export default {
 
     async getProducts(){
       const res = await index({
-        rows:this.select.pageSize,
+        page_size:this.select.pageSize,
         page:this.select.pageIndex,
         name:this.select.name,
         merchant_id:this.select.merchantId,
diff --git a/src/views/userManage/memberManage.vue b/src/views/userManage/memberManage.vue
index d867d05..e2f9067 100644
--- a/src/views/userManage/memberManage.vue
+++ b/src/views/userManage/memberManage.vue
@@ -34,7 +34,7 @@
       </lx-header>
     </div>
 
-    <xy-table :total="total" @pageSizeChange="e => select.pageSize = e" @pageIndexChange="pageChange" :list="list" :table-item="table" @editor="editorShow" @delete="deleteMember"></xy-table>
+    <xy-table :total="total" @pageSizeChange="pageSizeChange" @pageIndexChange="pageChange" :list="list" :table-item="table" @editor="editorShow" @delete="deleteMember"></xy-table>
 
     <addMember ref="addMember" @refresh="getMembers"></addMember>
   </div>
@@ -118,6 +118,15 @@ export default {
     }
   },
   methods: {
+    pageSizeChange(e){
+
+         this.select.pageSize = e
+      this.doSearch();
+    },
+    doSearch(){
+       this.select.pageIndex = 1
+       this.getMembers()
+    },
     pageChange(e){
       this.select.pageIndex = e
       this.getMembers()