Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

src/views/qw/qwCompany/index.vue

@@ -178,7 +178,18 @@
           <el-input v-model="form.serverAgentId" placeholder="请输入serverAgentId" />
         </el-form-item>
         <el-form-item label="小程序id" prop="miniAppId" >
-          <el-input v-model="form.miniAppId" placeholder="请输入小程序id" />
+          <el-select
+            v-model="form.miniAppId"
+            placeholder="请选择"
+            size="small"
+          >
+            <el-option
+              v-for="item in miniAppList"
+              :key="item.appId"
+              :label="item.appName"
+              :value="item.appId"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="企业可信IP" >
           <div>42.194.245.189;119.29.195.254;129.204.130.233;43.138.187.210;129.204.76.229;159.75.239.132119.29.249.66;122.152.230.82</div>
@@ -392,6 +403,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getAppList()
       this.open = true;
       this.form.token="1o62d3YxvdHd4LEUiltnu7sK";
       this.form.encodingAesKey="UJfTQ5qKTKlegjkXtp1YuzJzxeHlUKvq5GyFbERN1iU";
@@ -400,6 +412,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.getAppList()
       const id = row.id || this.ids
       getQwCompany(id).then(response => {
         this.form = response.data;