Merge branch 'develop' into lmm1

src/app/views/wechat-config/wechat-config.component.ts

@@ -69,6 +69,9 @@ export class WechatConfigComponent implements OnInit {
       return;
     }
     const postData = {
+			...this.configData,
+			agentId: this.validateForm.controls.agentid.value,
+			appId: this.validateForm.controls.appid.value,
       id: this.id,
       appSecret: this.validateForm.controls.secret.value,
       createUser:
@@ -97,12 +100,14 @@ export class WechatConfigComponent implements OnInit {
     );
   }
   // 获取微信配置
+	configData:any;
   getWechatConfig() {
     const postData = { idx: 0, sum: 1 };
     this.mainService
       .getFetchDataList("simple/data", "wechatConfig", postData)
       .subscribe((result) => {
         if (result.status == 200) {
+					this.configData = result.list[0];
           const config = result.list[0];
           if (!config) {
             this.loading1 = false;