Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-ui/src/api/adapayMember/adapayMember.js

@@ -19,7 +19,7 @@ export function selectAdapayMember(data) {
 // 营收报表
 export function getMerchantOrderReport(data) {
   return request({
-    url: '/pile/report/getMerchantOrderReport',
+    url: '/order/report/getMerchantOrderReport',
     method: 'post',
     data: data
   })
@@ -72,4 +72,4 @@ export function withdraw(data) {
         method: 'post',
         data: data
     })
-}
+}

jsowell-ui/src/components/MapContainer/MapContainer.vue

@@ -125,10 +125,16 @@ export default {
             // let lnglat = [lng, lat];
             // console.log("经纬度", lnglat);
           });
+          marker.on("click", (e) => {
+            let lat = e.lnglat.lat;
+            let lng = e.lnglat.lng;
+            this.getLngLatService(lat, lng);
+          });
         })
         .catch((e) => {
           console.log(e);
         });
+        
     },
     select(e) {
       this.placeSearch.search(e.poi.name); //关键字查询查询

jsowell-ui/src/views/pile/merchant/index.vue

@@ -256,6 +256,32 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="运营商等级" prop="merchantLevel">
+                            <el-select v-model="form.merchantLevel" placeholder="请选择运营商等级">
+                                <el-option
+                                    v-for="item in options"
+                                    :key="item.label"
+                                    :label="item.label"
+                                    :value="item.value"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="上级运营商" prop="parentId">
+                            <el-select v-model="form.parentId" placeholder="请选择上级运营商">
+                                <el-option
+                                    v-for="item in merchantList"
+                                    :key="item.merchantName"
+                                    :label="item.merchantName"
+                                    :value="item.id"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
                 <el-form-item label="公司logo" prop="logoUrl">
                     <el-upload
                         class="upload-demo"
@@ -361,6 +387,13 @@ export default {
                 servicePhone: null,
                 logoUrl: null,
             },
+            options: [{
+                value: '1',
+                label: '一级运营商'
+            }, {
+                value: '2',
+                label: '二级运营商'
+            }],
             // 表单参数
             form: {},
             // 表单校验