Przeglądaj źródła

Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v3.5.1

张延森 5 lat temu
rodzic
commit
e69ffc5647
2 zmienionych plików z 37 dodań i 9 usunięć
  1. 7
    7
      src/pages/person/menus.js
  2. 30
    2
      src/pages/project/index.js

+ 7
- 7
src/pages/person/menus.js Wyświetl plik

@@ -73,13 +73,13 @@ const menus = [
73 73
     // },
74 74
   ],
75 75
   [
76
-    {
77
-      name: '我的客户',
78
-      url: '/pages/person/myGuest/index',
79
-      icon: icons.client,
80
-      extends: undefined,
81
-      userTypes: [CONSULTANT],
82
-    },
76
+    // {
77
+    //   name: '我的客户',
78
+    //   url: '/pages/person/myGuest/index',
79
+    //   icon: icons.client,
80
+    //   extends: undefined,
81
+    //   userTypes: [CONSULTANT],
82
+    // },
83 83
     {
84 84
       name: '我的活动',
85 85
       url: '/pages/activity/myActivity?from=mine',

+ 30
- 2
src/pages/project/index.js Wyświetl plik

@@ -132,9 +132,37 @@ export default class Index extends Component {
132 132
       this.updateCity(defaultCity)
133 133
     })
134 134
   }
135
+  updateCity(payload) {
136
+    const NanJing = {
137
+      citycode: "025",
138
+      id: 320100,
139
+      initial: "N",
140
+      lat: "32.041544",
141
+      leveltype: 2,
142
+      lng: "118.767413",
143
+      name: "南京市",
144
+      parentid: 320000,
145
+      pinyin: "Nanjing",
146
+      shortname: "南京",
147
+      status: 1,
148
+      zipcode: "320100"
149
+    }
150
+
151
+    const appId = accountInfo.miniProgram.appId;
152
+    let params;
153
+
154
+    switch (appId) {
155
+      // 知与行联调
156
+      case 'wxd9ee3a9480a4e544':
157
+        params = NanJing;
158
+        break;
159
+
160
+      default:
161
+        params = payload;
162
+        break;
163
+    }
135 164
 
136
-  updateCity (payload) {
137
-    this.props.dispatchCitySelected(payload).then(res => {
165
+    this.props.dispatchCitySelected(params).then(res => {
138 166
       this.loadData()
139 167
     })
140 168
   }