### 0.3.8 专业版：

【优化】增加腾讯位置服务插件-微信小程序地图选点插件，替换以前的js调用腾讯地图选点插件。

CoreCms.Net.Uni-App/CoreShop/common/request/http.api.js

@@ -78,6 +78,8 @@ const install = (Vue, vm) => {
     let saveUserShipWx = (params, config = {}) => http.post('/Api/User/SaveUserShip', params, { custom: { methodName: 'user.saveusership', needToken: true } });
     //获取区域ID
     let getAreaId = (params, config = {}) => http.post('/Api/User/GetAreaId', params, { custom: { methodName: 'user.getareaid', needToken: false } });
+    //根据区/县名称获取城市id信息
+    let getAreaIdByName = (params, config = {}) => http.post('/Api/User/GetAreaIdByName', params, { custom: { methodName: 'user.getareaid', needToken: false } });
     // 获取收货地址详情
     let shipDetail = (params, config = {}) => http.post('/Api/User/GetShipDetail', params, { custom: { methodName: 'user.getshipdetail', needToken: true } });
     // 收货地址编辑
@@ -439,6 +441,7 @@ const install = (Vue, vm) => {
         saveUserShip,
         saveUserShipWx,
         getAreaId,
+        getAreaIdByName,
         shipDetail,
         editShip,
         removeShip,

CoreCms.Net.Uni-App/CoreShop/manifest.json

@@ -1,168 +1,174 @@
 {
-    "name" : "南山田舍",
+  "name": "南山田舍",
-    "appid" : "__UNI__EAACF14",
+  "appid": "__UNI__EAACF14",
-    "description" : "核心商城系统（CoreShop）是基于uni-app框架开发的商城应用程序",
+  "description": "核心商城系统（CoreShop）是基于uni-app框架开发的商城应用程序",
-    "versionName" : "1.0",
+  "versionName": "1.0",
-    "versionCode" : 1,
+  "versionCode": 1,
-    "transformPx" : false,
+  "transformPx": false,
-    "app-plus" : {
+  "app-plus": {
-        /* 5+App特有相关 */
+    /* 5+App特有相关 */
-        "modules" : {
+    "modules": {
-            "Payment" : {},
+      "Payment": {},
-            "VideoPlayer" : {}
+      "VideoPlayer": {}
+    },
+    /* 模块配置 */
+    "distribute": {
+      /* 应用发布信息 */
+      "android": {
+        /* android打包配置 */
+        "permissions": [
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+        ],
+        "abiFilters": [ "armeabi-v7a", "arm64-v8a", "x86" ]
+      },
+      "ios": {},
+      /* ios打包配置 */
+      "sdkConfigs": {
+        "payment": {
+          "weixin": {
+            "appid": "wx11d95cdaee6058f6"
+          },
+          "alipay": {
+            "scheme": ""
+          }
         },
-        /* 模块配置 */
+        "ad": {},
-        "distribute" : {
+        "maps": {},
-            /* 应用发布信息 */
+        "oauth": {
-            "android" : {
+          "univerify": {}
-                /* android打包配置 */
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
-            },
-            "ios" : {},
-            /* ios打包配置 */
-            "sdkConfigs" : {
-                "payment" : {
-                    "weixin" : {
-                        "appid" : "wx11d95cdaee6058f6"
-                    },
-                    "alipay" : {
-                        "scheme" : ""
-                    }
-                },
-                "ad" : {},
-                "maps" : {},
-                "oauth" : {
-                    "univerify" : {}
-                }
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            }
-        },
-        "splashscreen" : {
-            "waiting" : true
         }
-    },
+      },
-    /* SDK配置 */
+      "icons": {
-    "quickapp" : {},
+        "android": {
-    /* 快应用特有相关 */
+          "hdpi": "unpackage/res/icons/72x72.png",
-    "mp-weixin" : {
+          "xhdpi": "unpackage/res/icons/96x96.png",
-        "appid" : "wx6fc139d4de0b470f",
+          "xxhdpi": "unpackage/res/icons/144x144.png",
-        "setting" : {
+          "xxxhdpi": "unpackage/res/icons/192x192.png"
-            "urlCheck" : true,
-            "postcss" : true,
-            "minified" : true,
-            "es6" : true,
-            "checkSiteMap" : false
         },
-        "permission" : {
+        "ios": {
-            "scope.userLocation" : {
+          "appstore": "unpackage/res/icons/1024x1024.png",
-                "desc" : "用于获取您附近的门店列表"
+          "ipad": {
-            }
+            "app": "unpackage/res/icons/76x76.png",
-        },
+            "app@2x": "unpackage/res/icons/152x152.png",
-        "optimization" : {
+            "notification": "unpackage/res/icons/20x20.png",
-            "subPackages" : true
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "proapp@2x": "unpackage/res/icons/167x167.png",
+            "settings": "unpackage/res/icons/29x29.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "spotlight": "unpackage/res/icons/40x40.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png"
+          },
+          "iphone": {
+            "app@2x": "unpackage/res/icons/120x120.png",
+            "app@3x": "unpackage/res/icons/180x180.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "notification@3x": "unpackage/res/icons/60x60.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "settings@3x": "unpackage/res/icons/87x87.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png",
+            "spotlight@3x": "unpackage/res/icons/120x120.png"
+          }
         }
+      }
     },
-    "h5" : {
+    "splashscreen": {
-        "title" : "南山田舍",
+      "waiting": true
-        "domain" : "https://h5.demo.coreshop.cn",
+    }
-        "router" : {
+  },
-            "base" : "./",
+  /* SDK配置 */
-            "mode" : "hash"
+  "quickapp": {},
-        },
+  /* 快应用特有相关 */
-        "template" : "index.html",
+  "mp-weixin": {
-        "devServer" : {
+    "appid": "wx6fc139d4de0b470f",
-            "port" : 80,
+    "setting": {
-            "disableHostCheck" : true,
+      "urlCheck": true,
-            "https" : true
+      "postcss": true,
-        },
+      "minified": true,
-        "sdkConfigs" : {
+      "es6": true,
-            "maps" : {
+      "checkSiteMap": false
-                "qqmap" : {
+    },
-                    "key" : "AEIBZ-H5TRI-A6VGA-5KRNA-QKKK6-JGB33"
+    "plugins": {
-                }
+      "chooseLocation": {
-            }
+        "version": "1.0.9",
-        },
+        "provider": "wx76a9a06e5b4e693e"
-        "optimization" : {
+      }
-            "treeShaking" : {
+    },
-                "enable" : false
+    "permission": {
-            }
+      "scope.userLocation": {
+        "desc": "你的位置信息将用于小程序定位"
+      }
+    },
+    "optimization": {
+      "subPackages": true
+    }
+  },
+  "h5": {
+    "title": "南山田舍",
+    "domain": "https://h5.demo.coreshop.cn",
+    "router": {
+      "base": "./",
+      "mode": "hash"
+    },
+    "template": "index.html",
+    "devServer": {
+      "port": 80,
+      "disableHostCheck": true,
+      "https": true
+    },
+    "sdkConfigs": {
+      "maps": {
+        "qqmap": {
+          "key": "AEIBZ-H5TRI-A6VGA-5KRNA-QKKK6-JGB33"
         }
+      }
     },
-    "mp-toutiao" : {
+    "optimization": {
-        "setting" : {
+      "treeShaking": {
-            "es6" : true,
+        "enable": false
-            "postcss" : true,
+      }
-            "minified" : true
+    }
-        },
+  },
-        "appid" : ""
+  "mp-toutiao": {
+    "setting": {
+      "es6": true,
+      "postcss": true,
+      "minified": true
     },
-    "mp-qq" : {
+    "appid": ""
-        "setting" : {
+  },
-            "es6" : true,
+  "mp-qq": {
-            "postcss" : true,
+    "setting": {
-            "minified" : true
+      "es6": true,
-        },
+      "postcss": true,
-        "optimization" : {
+      "minified": true
-            "subPackages" : true
-        }
     },
-    "mp-alipay" : {},
+    "optimization": {
-    "mp-baidu" : {}
+      "subPackages": true
+    }
+  },
+  "mp-alipay": {},
+  "mp-baidu": {}
 }

CoreCms.Net.Uni-App/CoreShop/pages/member/address/index/index.vue

@@ -19,41 +19,32 @@
                     <u--input v-model="form.mobile" placeholder="请填写收货人手机号" />
                 </u-form-item>
 
-                <u-form-item label="选取区域" borderBottom>
+                <u-form-item label="省市县" borderBottom>
                     <coreshop-select v-model="show" mode="mutil-column-auto" :list="pickerList" :default-value="pickerIndex" @confirm="onConfirm"></coreshop-select>
                     <!-- 注意：由于兼容性差异，如果需要使用前后插槽，nvue下需使用u--input，非nvue下需使用u-input -->
                     <!-- #ifndef APP-NVUE -->
                     <u-input :value="pickerValue" type="select" disabled placeholder="请选择省市区区域">
                         <template slot="suffix">
-                            <u-button text="选择" type="success" size="mini" @click="show = true"></u-button>
+                            <u-button text="请选择" type="success" size="mini"  @click="toMap"></u-button>
                         </template>
                     </u-input>
                     <!-- #endif -->
                     <!-- #ifdef APP-NVUE -->
                     <u--input :value="pickerValue" type="select" disabled placeholder="请选择省市区区域">
                         <template slot="suffix">
-                            <u-button text="选择" type="success" size="mini" @click="show = true"></u-button>
+                            <u-button text="请选择" type="success" size="mini"  @click="toMap"></u-button>
                         </template>
                     </u--input>
                     <!-- #endif -->
-
                 </u-form-item>
 
-                <u-form-item label="选取街道" borderBottom>
+                <u-form-item label="地点" borderBottom>
                     <!-- 注意：由于兼容性差异，如果需要使用前后插槽，nvue下需使用u--input，非nvue下需使用u-input -->
                     <!-- #ifndef APP-NVUE -->
-                    <u-input :value="form.street" type="text" disabled placeholder="请选择街道">
+                    <u-input :value="form.street" type="text" disabled placeholder="请选择"></u-input>
-                        <template slot="suffix">
-                            <u-button text="选择" type="success" size="mini" @click="toMap"></u-button>
-                        </template>
-                    </u-input>
                     <!-- #endif -->
                     <!-- #ifdef APP-NVUE -->
-                    <u--input :value="form.street" type="text" disabled placeholder="请选择街道">
+                    <u--input :value="form.street" type="text" disabled placeholder="请选择"></u--input>
-                        <template slot="suffix">
-                            <u-button text="选择" type="success" size="mini" @click="toMap"></u-button>
-                        </template>
-                    </u--input>
                     <!-- #endif -->
                 </u-form-item>
 
@@ -83,6 +74,7 @@
 </template>
 
 <script>
+    const chooseLocation = requirePlugin('chooseLocation');
     export default {
         data() {
             return {
@@ -96,6 +88,8 @@
                     latitude: '',
                     street: ''
                 },
+                longitude: 0,
+                latitude: 0,
                 region: ['湖南省', '怀化市', '鹤城区'],
                 areaId: 0,
                 checked: false,
@@ -152,7 +146,47 @@
                 },
             }
         },
+        onShow() {
+            const location = chooseLocation.getLocation(); // 如果点击确认选点按钮，则返回选点结果对象，否则返回null
+            if (location != null) {
+                this.form.latitude = location.latitude;
+                this.form.longitude = location.longitude;
+
+                this.region = [location.province, location.district, location.city];
+                //let data = {
+                //    provinceName: location.province,
+                //    cityName: location.district,
+                //    countyName: location.city
+                //};
+                this.form.street = location.name;
+                this.form.address = location.address;
+
+                let postData = {
+                    id: location.district
+                }
+                this.$u.api.getAreaIdByName(postData).then(res => {
+                    if (res.status) {
+                        this.areaId = res.data.areaId;
+                        this.pickerValue = res.data.fullName;
+                    } else {
+                        uni.showModal({
+                            title: '提示',
+                            content: '地区选择出现问题，请重新选择地区',
+                            showCancel: false
+                        });
+                    }
+                });
+
+
+                console.log("location1:", location);
+            }
+        },
+        onUnload() {
+            // 页面卸载时设置插件选点数据为null，防止再次进入页面，geLocation返回的是上次选点结果
+            chooseLocation.setLocation(null);
+        },
         onLoad(e) {
+            this.getMyLocation();
             if (e.shipId) {
                 //编辑
                 this.id = e.shipId;
@@ -168,6 +202,21 @@
             this.$refs.uForm.setRules(this.rules);
         },
         methods: {
+            // 获取自己的位置信息
+            getMyLocation() {
+                let _this = this;
+                uni.getLocation({
+                    type: 'wgs84',
+                    success: function (res) {
+                        _this.longitude = res.longitude;
+                        _this.latitude = res.latitude;
+                    },
+                    fail: function () {
+                        _this.$u.toast("获取位置信息失败")
+                    }
+                });
+
+            },
             onConfirm(e) {
                 let provinceName = e[0].label;
                 let cityName = e[1].label;
@@ -365,12 +414,24 @@
                 this.pickerIndex = [this.provinceKey, this.cityKey, this.areaKey];
             },
             toMap() {
-                if (!this.pickerValue) {
+                const txMapkey = this.$store.state.config.qqMapKey; //使用在腾讯位置服务申请的key
-                    this.$u.toast('请先获取省市区信息');
+                const referer = this.$store.state.config.shopName; //调用插件的app的名称
-                    return false;
+                const location = JSON.stringify({
-                } else {
+                    latitude: this.form.latitude == "" ? this.latitude : this.form.latitude,
-                    this.$u.route('/pages/member/address/map/map', { pickerValue: this.pickerValue, areaId: this.areaId, longitude: this.form.longitude, latitude: this.form.latitude });
+                    longitude: this.form.longitude == "" ? this.longitude : this.form.longitude
-                }
+                });
+                const category = '';
+
+                wx.navigateTo({
+                    url: 'plugin://chooseLocation/index?key=' + txMapkey + '&referer=' + referer + '&location=' +
+                        location + '&category=' + category
+                });
+                //if (!this.pickerValue) {
+                //    this.$u.toast('请先获取省市区信息');
+                //    return false;
+                //} else {
+                //    this.$u.route('/pages/member/address/map/map', { pickerValue: this.pickerValue, areaId: this.areaId, longitude: this.form.longitude, latitude: this.form.latitude });
+                //}
             }
 
         },

CoreCms.Net.Web.WebApi/Controllers/UserController.cs

@@ -561,6 +561,30 @@ namespace CoreCms.Net.Web.WebApi.Controllers
         }
         #endregion
 
+        #region 根据区/县名称获取城市id信息
+        /// <summary>
+        /// 根据区/县名称获取城市id信息
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<WebApiCallBack> GetAreaIdByName([FromBody] FMStringId entity)
+        {
+            var jm = new WebApiCallBack();
+
+            var dataArea = await _areaServices.QueryByClauseAsync(p => p.name == entity.id && p.depth == 3);
+            if (dataArea == null) return jm;
+            var fullName = await _areaServices.GetAreaFullName(dataArea.id);
+            jm.status = true;
+            jm.data = new
+            {
+                areaId = dataArea.id,
+                fullName = fullName.data
+            };
+            return jm;
+        }
+        #endregion
+
         #region 注销登录
         /// <summary>
         /// 注销登录