Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !38

pages/my/teachingArea/teachingArea.js

@@ -22,6 +22,7 @@ Page({
    */
   onLoad: function (options) {
     this.getCitylist()
+    this.getMyarea()
   },
   showCitypop(e) {
     this.setData({
@@ -34,6 +35,22 @@ Page({
       show: false
     })
   },
+  getMyarea : function () {
+    let params = {
+      url:'coach/myarea',
+      data : {
+        coach_id: app.globalData.coach_id,
+      },
+      callback : (data) => {
+        console.log(data)
+        this.setData({
+          myarea : data
+        })
+        
+      }
+    }
+    base.newRequest(params)
+  },
   getCitylist: function () {
     let params = {
       url: 'coach/city',