Merge branch 'master' of http://git.topboom0912.com/czj/rebatedine-mini into master

src/manifest.json

@@ -54,7 +54,7 @@
 
 	},
 	"mp-weixin": { /* 微信小程序特有相关 */
-		"appid": "wx268dbc0f5dd92c92",
+		"appid": "wx3153d02066d316b7",
 		"setting": {
 			"urlCheck": false
 		},

src/pages/classification.vue

@@ -126,7 +126,7 @@ export default {
     getLocation () {
       return new Promise((resolve, reject) => {
         uni.getLocation({
-          type: 'wgs84',
+          type: 'gcj02',
           success: (res) => {
             this.isLocation = true
             resolve(res)

src/pages/index.vue

@@ -164,7 +164,7 @@ export default {
     getLocation () {
       return new Promise((resolve, reject) => {
         uni.getLocation({
-          type: 'wgs84',
+          type: 'gcj02',
           success: (res) => {
             this.isLocation = true
             resolve(res)

src/pagesSub/activity/activityDetail.vue

@@ -296,7 +296,7 @@ export default {
     getLocation () {
       return new Promise((resolve, reject) => {
         uni.getLocation({
-          type: 'wgs84',
+          type: 'gcj02',
           success: (res) => {
             resolve(res)
           },

src/pagesSub/order/rule.vue

@@ -24,7 +24,7 @@ export default {
     getLocation () {
       return new Promise((resolve, reject) => {
         uni.getLocation({
-          type: 'wgs84',
+          type: 'gcj02',
           success: (res) => {
             resolve(res)
           },

src/pagesSub/order/submitOutcome.vue

@@ -44,7 +44,7 @@ export default {
     getLocation () {
       return new Promise((resolve, reject) => {
         uni.getLocation({
-          type: 'wgs84',
+          type: 'gcj02',
           success: (res) => {
             resolve(res)
           },