Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/appmarket/AppPreview.vue

@@ -26,7 +26,7 @@ export default {
     sendInfo() {
       let siteId = this.previewInfo.siteId;
       let appId = this.previewInfo.appId;
-      let baseUrl = process.env.VUE_APP_API_BASE_URL;
+      let baseUrl = this.previewInfo.baseUrl;
       this.previewUrl = `${this.previewInfo.previewUrl}?siteId=${siteId}&appId=${appId}&baseUrl=${baseUrl}`;
       /* eslint-disable */
       // myIframe.window.postMessage(obj, "*");

base-manager-ui/admin/src/pages/basicset/appmarket/components/AppDetailsPage.vue

@@ -192,6 +192,7 @@ export default {
       let res = await getAppInfo({ id: this.appId });
       if (res.data.code === 1) {
         this.appInfo = res.data.data;
+        console.log(this.appInfo);
       }
     },
     // 获取历史版本
@@ -245,19 +246,10 @@ export default {
             previewUrl: data,
             siteId: this.appInfo.siteId,
             appId: this.appId,
+            baseUrl: this.appInfo.serviceApi,
           },
         });
         window.open(routeUrl.href, "_blank");
-
-        // this.$router.push({
-        //   path: "/apppreview",
-        //   query: {
-        //     previewUrl: data,
-        //     siteId: this.appInfo.siteId,
-        //     appId: this.appId,
-        //   },
-        // });
-        // window.open(data);
       }
     },
     // 翻页

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue

@@ -105,6 +105,9 @@
           <a-form-model-item v-else label="应用URL" prop="url">
             <a-input v-model="form.url" placeholder="请输入应用URL" />
           </a-form-model-item>
+          <a-form-model-item label="服务器IP" prop="serviceApi">
+            <a-input v-model="form.serviceApi" placeholder="请输入服务器地址" />
+          </a-form-model-item>
           <a-form-model-item label="更新说明" prop="notes">
             <a-textarea
               placeholder="请输入更新说明"
@@ -193,6 +196,7 @@ export default {
         summary: "", // 简介
         notes: "", // 更新说明
         dataUpdate: 0, // 是否数据更新(0.否，1.是)
+        serviceApi: "", // 服务器接口地址
       },
       replaceFields: {
         title: "label",
@@ -220,6 +224,9 @@ export default {
           { required: true, message: "请输入应用简介", trigger: "blur" },
         ],
         url: [{ required: true, message: "请输入应用URL", trigger: "blur" }],
+        serviceApi: [
+          { required: true, message: "请输入服务器地址", trigger: "blur" },
+        ],
         notes: [
           { required: true, message: "请输入应用更新说明", trigger: "blur" },
         ],

base-manager-ui/admin/src/pages/basicset/surface/informationskin/InformationSkin.vue

@@ -9,12 +9,13 @@
       <div
         class="header"
         :style="{
-          background: filterItem('2', 0),
+          background: filterItem('11', 0),
+          color: filterItem('2', 0),
         }"
       >
         政务服务中心
       </div>
-      <div class="main flex1 flex aic jcb">
+      <div class="main flex aic jcb">
         <div class="left">
           <img src="../../../../assets/img/banner2.png" />
         </div>
@@ -25,7 +26,7 @@
       <div
         class="footer flex"
         :style="{
-          background: filterItem('11', 0),
+          background: filterItem('12', 0),
         }"
       >
         <div
@@ -51,7 +52,8 @@
       <div
         class="header"
         :style="{
-          background: filterItem('2', 0),
+          background: filterItem('11', 0),
+          color: filterItem('2', 0),
         }"
       >
         政务服务中心
@@ -67,7 +69,7 @@
       <div
         class="footer flex"
         :style="{
-          background: filterItem('11', 0),
+          background: filterItem('12', 0),
         }"
       >
         <div
@@ -179,9 +181,11 @@ export default {
     background-size: 100% 100% !important;
   }
   .main {
+    height: 432px;
     .left,
     .right {
       width: 50%;
+      height: 100%;
       img {
         width: 100%;
         height: 100%;

base-manager-ui/admin/src/pages/basicset/surface/modal/AddField.vue

@@ -71,7 +71,8 @@ const attrType = [
   { key: "8", label: "辅助色" },
   { key: "9", label: "备案" },
   { key: "10", label: "信息面板" },
-  { key: "11", label: "底部背景" },
+  { key: "11", label: "头部背景" },
+  { key: "12", label: "底部背景" },
 ];
 export default {
   props: {