修改

config/index.js

@@ -12,7 +12,7 @@ module.exports = {
     proxyTable: {
       "/apaas": {
         //target: "https://apaas.cztest.local/apaas/",
-        target: "https://apaas3.wodcloud.com/apaas/",
+        target: "https://apaas-jzapi.test.wodcloud.com/apaas/",
         changeOrigin: true,
         secure: false,//https证书安全设置为false
         pathRewrite: {
@@ -27,7 +27,7 @@ module.exports = {
         }
       },
       "/vmap": {
-        target: "https://apaas3.wodcloud.com/vmap/",
+        target: "https://apaas-jzapi.test.wodcloud.com/vmap/",
         changeOrigin: true,
         pathRewrite: {
           "^/vmap": ""

src/components/menu.vue

@@ -128,7 +128,7 @@
             @click="settlement"
             size="small"
             class="shop_settlement"
-          >去购物车申请</el-button>
+          >去申请结算</el-button>
         </div>
       </div>
       <div
@@ -151,16 +151,17 @@
           v-if="item.Child && item.Child.length"
           style="left: 30px"
         >
-          <div
-            v-for="(v, indexs) in item.Child"
-            :key="indexs + 700"
-            @mouseleave.stop="change_now_hover(-1)"
-            @mouseenter.stop="change_now_hover(indexs)"
-            @click.stop="gotoChildPage(v, item.visit_url)"
-            v-if="v.menu_name != '在线组件工具'"
-          >
-            {{ v.menu_name }}
-          </div>
+          <template v-for="(v, indexs) in item.Child">
+            <div
+              :key="indexs + 700"
+              @mouseleave.stop="change_now_hover(-1)"
+              @mouseenter.stop="change_now_hover(indexs)"
+              @click.stop="gotoChildPage(v, item.visit_url)"
+              v-if="v.menu_name != '在线组件工具'"
+            >
+              {{ v.menu_name }}
+            </div>
+          </template>
         </div>
         <div
           class="sj"
@@ -201,7 +202,7 @@ export default {
       shopping_list: [],
       menuCartNum: 0,
       now_hover: -1,
-      show_shop_menu: false
+      show_shop_menu: false,
     };
   },
   mounted() {
@@ -220,7 +221,7 @@ export default {
     },
     getRouter() {
       return this.$route.path;
-    }
+    },
   },
   watch: {
     getMenuCartState(newVal) {
@@ -234,7 +235,7 @@ export default {
       ) {
         this.now_menu = val;
       }
-    }
+    },
   },
   methods: {
     change_now_hover(n) {
@@ -263,7 +264,7 @@ export default {
     },
     deleteItem(id) {
       let query = [id];
-      this.$api.serviceShop.delShoppingCart(query).then(response => {
+      this.$api.serviceShop.delShoppingCart(query).then((response) => {
         if (response.data.success == 1) {
           this.$store.commit("setCartState");
           this.getList();
@@ -297,7 +298,7 @@ export default {
       }
     },
     getList() {
-      this.$api.serviceShop.getShoppingCart().then(response => {
+      this.$api.serviceShop.getShoppingCart().then((response) => {
         if (response.data.success == "1") {
           this.menuCartNum = response.data.data.valid
             ? response.data.data.valid.length
@@ -315,12 +316,12 @@ export default {
       console.log(this.now_menu);
     },
     getNowMenu() {
-      this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {
+      this.$api.general.getNowMenu({ teamName: "APAAS3" }).then((response) => {
         if (response.data.success == 1) {
           let arr =
             (response.data.data[0] && response.data.data[0].Child) || [];
           let shop_index = arr.findIndex(
-            item => item.visit_url == "/shop/shopping_cart"
+            (item) => item.visit_url == "/shop/shopping_cart"
           );
           if (shop_index != -1) {
             arr.splice(shop_index, 1);
@@ -328,7 +329,7 @@ export default {
           } else {
             this.show_shop_menu = false;
           }
-          let user_index = arr.findIndex(item => item.visit_url == "/user");
+          let user_index = arr.findIndex((item) => item.visit_url == "/user");
           if (user_index != -1) {
             this.user_arr = arr[user_index].Child;
             arr.splice(user_index, 1);
@@ -338,8 +339,8 @@ export default {
           this.getMenuIndex();
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>
 

src/components/service-info/app-info.vue

@@ -7,11 +7,17 @@
   >
     <div class="main_container">
       <div class="main_container-left">
-        <img :src="datas.logo" width="100%" />
+        <img
+          :src="datas.logo"
+          width="100%"
+        />
       </div>
       <div class="main_container-right">
         <div class="service_title">
-          <span class="service_name" v-text="datas.app_name"></span>
+          <span
+            class="service_name"
+            v-text="datas.app_name"
+          ></span>
           <div style="margin-right:auto">
             <span class="service_access_info1">
               <img :src="require('@/assets/imgs/icon_liulan.png')" />
@@ -23,54 +29,95 @@
             </span>
           </div>
           <span class="service_access_info">
-            <el-button class="service_now_buy" @click="applyImmediately">
+            <el-button
+              class="service_now_buy"
+              @click="applyImmediately"
+            >
               立即申请
             </el-button>
           </span>
           <span class="service_access_info">
-            <el-button class="service_add_cart" @click="addToCart">
-              加入购物车
+            <el-button
+              class="service_add_cart"
+              @click="addToCart"
+            >
+              加入申请单
             </el-button>
           </span>
         </div>
         <div class="baseInfo_box">
           <tr class="flex_3">
             <td>部署来源：
-              <el-tooltip class="item" effect="dark" :content="datas.online_state_name" placement="top-start">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="datas.online_state_name"
+                placement="top-start"
+              >
                 <span>{{datas.online_state_name}}</span>
               </el-tooltip>
             </td>
             <td>业务领域：
-              <el-tooltip class="item" effect="dark" :content="datas.ywly_name" placement="top-start">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="datas.ywly_name"
+                placement="top-start"
+              >
                 <span>{{datas.ywly_name}}</span>
               </el-tooltip>
             </td>
             <td>应用类型：
-              <el-tooltip class="item" effect="dark" :content="datas.type_name" placement="top-start">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="datas.type_name"
+                placement="top-start"
+              >
                 <span>{{datas.type_name}}</span>
               </el-tooltip>
             </td>
           </tr>
           <tr class="flex_3">
             <td>提供组织：
-              <el-tooltip class="item" effect="dark" :content="datas.organization_name" placement="top-start">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="datas.organization_name"
+                placement="top-start"
+              >
                 <span>{{datas.organization_name}}</span>
               </el-tooltip>
             </td>
             <td>联系人：
-              <el-tooltip class="item" effect="dark" :content="datas.username" placement="top-start">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="datas.username"
+                placement="top-start"
+              >
                 <span>{{datas.username}}</span>
               </el-tooltip>
             </td>
             <td>联系方式：
-              <el-tooltip class="item" effect="dark" :content="datas.phone" placement="top-start">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="datas.phone"
+                placement="top-start"
+              >
                 <span>{{datas.phone}}</span>
               </el-tooltip>
             </td>
           </tr>
           <tr class="flex_3">
             <td>上线时间：
-              <el-tooltip class="item" effect="dark" :content="helper.dateStringTransform(datas.create_date)" placement="top-start">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="helper.dateStringTransform(datas.create_date)"
+                placement="top-start"
+              >
                 <span>{{helper.dateStringTransform(datas.create_date)}}</span>
               </el-tooltip>
             </td>
@@ -121,7 +168,7 @@ export default {
     },
     addToCart() {
       // console.log("addToCart");
-      console.log(this.datas)
+      console.log(this.datas);
       this.$http
         .post("/apaas/serviceapp/v3/shopcart/add", {
           service_id: 0, // 0表示不是服务
@@ -147,7 +194,7 @@ export default {
         })
         .catch((error) => {
           this.$message({
-            message: `添加购物车失败`,
+            message: `添加申请单失败`,
             type: "warning",
           });
         });

src/components/service-info/service-info.vue

@@ -6,8 +6,15 @@
     v-if="data"
   >
     <div class="main_container">
-      <div class="main_container-left" v-if="data.cover">
-        <img :src="data.cover" width="100%" v-if="!(data.type == 'workflow' && data.workflows_id != 0) || !(data.type === 'Map Service')" />
+      <div
+        class="main_container-left"
+        v-if="data.cover"
+      >
+        <img
+          :src="data.cover"
+          width="100%"
+          v-if="!(data.type == 'workflow' && data.workflows_id != 0) || !(data.type === 'Map Service')"
+        />
         <workflows-view
           :isShop="true"
           :id="parseInt(data.workflows_id)"
@@ -31,12 +38,25 @@
               ( {{ data.version }} )
             </span>
           </span>
-          <span class="service_type" v-if="data.type" v-text="data.type"></span>
-          <span v-if="data.openness == 1" class="tags shared">共享</span>
-          <span v-else-if="data.openness == 2" class="tags restricted">
+          <span
+            class="service_type"
+            v-if="data.type"
+            v-text="data.type"
+          ></span>
+          <span
+            v-if="data.openness == 1"
+            class="tags shared"
+          >共享</span>
+          <span
+            v-else-if="data.openness == 2"
+            class="tags restricted"
+          >
             受限
           </span>
-          <span v-else class="tags sensitive">敏感</span>
+          <span
+            v-else
+            class="tags sensitive"
+          >敏感</span>
           <span class="service_access_info">
             <el-button
               class="service_now_buy"
@@ -50,7 +70,7 @@
               class="service_add_cart"
               @click="addToCart"
             >
-              加入购物车
+              加入申请单
             </el-button>
           </span>
         </div>
@@ -58,21 +78,36 @@
           <tr class="flex_3">
             <td>
               服务类型：
-              <el-tooltip class="item" effect="dark" :content="baseInfo.fwlx" placement="top-start">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="baseInfo.fwlx"
+                placement="top-start"
+              >
                 <span>{{baseInfo.fwlx}}</span>
               </el-tooltip>
             </td>
             <td>
               服务领域：
-              <el-tooltip class="item" effect="dark" :content="baseInfo.fwly" placement="top-start">
-                
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="baseInfo.fwly"
+                placement="top-start"
+              >
+
                 <span>{{baseInfo.fwly}}</span>
               </el-tooltip>
             </td>
             <td>
               提供组织：
-              <el-tooltip class="item" effect="dark" :content="baseInfo.tgzz" placement="top-start">
-                
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="baseInfo.tgzz"
+                placement="top-start"
+              >
+
                 <span>{{baseInfo.tgzz}}</span>
               </el-tooltip>
             </td>
@@ -80,22 +115,37 @@
           <tr class="flex_3">
             <td>
               联系人：
-              <el-tooltip class="item" effect="dark" :content="baseInfo.lxr" placement="top-start">
-                
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="baseInfo.lxr"
+                placement="top-start"
+              >
+
                 <span>{{baseInfo.lxr}}</span>
               </el-tooltip>
             </td>
             <td>
               联系方式：
-              <el-tooltip class="item" effect="dark" :content="baseInfo.lxfs" placement="top-start">
-                
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="baseInfo.lxfs"
+                placement="top-start"
+              >
+
                 <span>{{baseInfo.lxfs}}</span>
               </el-tooltip>
             </td>
             <td>
               发布时间：
-              <el-tooltip class="item" effect="dark" :content="helper.dateStringTransform(baseInfo.fbsj)" placement="top-start">
-                
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="helper.dateStringTransform(baseInfo.fbsj)"
+                placement="top-start"
+              >
+
                 <span>{{helper.dateStringTransform(baseInfo.fbsj)}}</span>
               </el-tooltip>
             </td>
@@ -103,22 +153,31 @@
           <tr class="flex_3">
             <td>
               最近更新时间：
-              <el-tooltip class="item" effect="dark" :content="helper.dateStringTransform(baseInfo.zjgxsj)" placement="top-start">
-                
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="helper.dateStringTransform(baseInfo.zjgxsj)"
+                placement="top-start"
+              >
+
                 <span>{{helper.dateStringTransform(baseInfo.zjgxsj)}}</span>
               </el-tooltip>
             </td>
             <td>
               服务描述：
-              <el-tooltip class="item" effect="dark" :content="baseInfo.fwms" placement="top-start">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="baseInfo.fwms"
+                placement="top-start"
+              >
                 <span>{{baseInfo.fwms}}</span>
               </el-tooltip>
             </td>
             <td></td>
           </tr>
         </div>
-        
-    
+
       </div>
     </div>
   </BlockRadius>
@@ -152,29 +211,32 @@ export default {
     duration: 1, // 时长
     showTime: false,
     baseInfo: {
-      fwlx: '',
-      fwly: '',
-      tgzz: '',
-      lxr: '',
-      lxfs: '',
-      fbsj: '',
-      zjgxsj: '',
-      fwms: ''
+      fwlx: "",
+      fwly: "",
+      tgzz: "",
+      lxr: "",
+      lxfs: "",
+      fbsj: "",
+      zjgxsj: "",
+      fwms: "",
     },
   }),
   computed: {},
   watch: {},
   methods: {
     getBaseInfo() {
-      let data = {...this.data}
-      this.baseInfo.fwlx = data.data_service_type && data.data_service_type.length > 0? data.data_service_type.join(' ') : ''
-      this.baseInfo.fwly = data.sectors_name
-      this.baseInfo.tgzz = data.organization_name
-      this.baseInfo.lxr = data.user_name
-      this.baseInfo.lxfs = data.phone
-      this.baseInfo.fbsj = data.create_time
-      this.baseInfo.zjgxsj = data.update_date
-      this.baseInfo.fwms = data.descript
+      let data = { ...this.data };
+      this.baseInfo.fwlx =
+        data.data_service_type && data.data_service_type.length > 0
+          ? data.data_service_type.join(" ")
+          : "";
+      this.baseInfo.fwly = data.sectors_name;
+      this.baseInfo.tgzz = data.organization_name;
+      this.baseInfo.lxr = data.user_name;
+      this.baseInfo.lxfs = data.phone;
+      this.baseInfo.fbsj = data.create_time;
+      this.baseInfo.zjgxsj = data.update_date;
+      this.baseInfo.fwms = data.descript;
     },
     dateTransform(datestr = "") {
       return helper.dateStringTransform(datestr);
@@ -217,7 +279,7 @@ export default {
         })
         .catch((error) => {
           this.$message({
-            message: `添加购物车失败`,
+            message: `添加申请单失败`,
             type: "warning",
           });
         });
@@ -236,7 +298,7 @@ export default {
     },
   },
   created() {
-    this.getBaseInfo()
+    this.getBaseInfo();
   },
 };
 </script>

src/components/service-list/commodity-card-old.vue

 <template>
   <div class="com_card">
     <div class="com_card_top">
-      <img :src="cellData.logo" class="com_card_img" />
+      <img
+        :src="cellData.logo"
+        class="com_card_img"
+      />
       <div class="com_card_name_v">
         <div class="com_card_msg_name">{{ cellData.app_name }}</div>
         <div class="com_card_msg_version">V{{ cellData.version }}</div>
@@ -20,8 +23,16 @@
       <div class="com_card_msg_num1">{{ cellData.deploy_times }}</div>
     </div>
     <div class="com_card_btn">
-      <el-button size="medium" class="btn_1" @click="addShop(cellData.app_id)">加入购物车</el-button>
-      <el-button size="medium" class="btn_2" @click="goUrl(cellData.app_id)">查看详情</el-button>
+      <el-button
+        size="medium"
+        class="btn_1"
+        @click="addShop(cellData.app_id)"
+      >加入申请单</el-button>
+      <el-button
+        size="medium"
+        class="btn_2"
+        @click="goUrl(cellData.app_id)"
+      >查看详情</el-button>
     </div>
   </div>
 </template>
@@ -72,7 +83,7 @@ export default {
         })
         .catch((error) => {
           this.$message({
-            message: `添加购物车失败`,
+            message: `添加申请单失败`,
             type: "warning",
           });
         });

src/pages/authority/user/organizationuser.vue

@@ -15,7 +15,12 @@
       }}</span>
     </p>
     <div class="info_contain">
-      <el-form ref="form" :rules="rules" :model="form" label-width="0px">
+      <el-form
+        ref="form"
+        :rules="rules"
+        :model="form"
+        label-width="0px"
+      >
         <el-form-item prop="account">
           <p class="formname">用户账号：</p>
           <el-input
@@ -23,13 +28,20 @@
             :disabled="tranform_flag(edit_flag)"
           ></el-input>
         </el-form-item>
-        <el-form-item prop="password" :class="{ shortpass: edit_flag }">
+        <el-form-item
+          prop="password"
+          :class="{ shortpass: edit_flag }"
+        >
           <p class="formname">登录密码：</p>
           <el-input
             v-model="form.password"
             :disabled="tranform_flag(edit_flag)"
           ></el-input>
-          <div v-if="edit_flag" class="fixpass" @click="change_pass()">
+          <div
+            v-if="edit_flag"
+            class="fixpass"
+            @click="change_pass()"
+          >
             修改密码
           </div>
         </el-form-item>
@@ -53,20 +65,27 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="systemname" v-if="form.type !== 1">
+        <el-form-item
+          prop="systemname"
+          v-if="form.type !== 1"
+        >
           <p class="formname">业务系统名称：</p>
           <el-input v-model="form.systemname"></el-input>
         </el-form-item>
-        <el-form-item prop="domain" v-if="form.type == 3 || form.type == 4">
+        <el-form-item
+          prop="domain"
+          v-if="form.type == 3 || form.type == 4"
+        >
           <p class="formname">域名：</p>
           <el-input v-model="form.domain"></el-input>
         </el-form-item>
-        <el-form-item prop="ip" v-if="form.type == 3 || form.type == 4">
+        <el-form-item
+          prop="ip"
+          v-if="form.type == 3 || form.type == 4"
+        >
           <p class="formname">IP白名单：</p>
           <!-- <el-input v-model="form.ip"></el-input> -->
-          <div
-            style="width:1022px;min-height:60px;border:1px solid #dcdfe6;border-radius:4px;padding:5px;"
-          >
+          <div style="width:1022px;min-height:60px;border:1px solid #dcdfe6;border-radius:4px;padding:5px;">
             <el-tag
               v-if="form.ip.length"
               :key="tag"
@@ -92,8 +111,7 @@
               class="button-new-tag"
               size="small"
               @click="showInput"
-              >新增</el-button
-            >
+            >新增</el-button>
           </div>
         </el-form-item>
         <el-form-item prop="contact">
@@ -108,9 +126,15 @@
           <p class="formname">邮箱：</p>
           <el-input v-model="form.email"></el-input>
         </el-form-item>
-        <el-form-item prop="origin" v-if="form.type !== 1">
+        <el-form-item
+          prop="origin"
+          v-if="form.type !== 1"
+        >
           <p class="formname">用户组织机构：</p>
-          <el-select v-model="form.origin" placeholder="请选择">
+          <el-select
+            v-model="form.origin"
+            placeholder="请选择"
+          >
             <el-option
               v-for="item in originoptions"
               :key="item.value + 100"
@@ -122,7 +146,10 @@
         </el-form-item>
         <el-form-item prop="able">
           <p class="formname">是否禁用：</p>
-          <el-select v-model="form.able" placeholder="请选择">
+          <el-select
+            v-model="form.able"
+            placeholder="请选择"
+          >
             <el-option
               v-for="item in ableoptions"
               :key="item.value + 200"
@@ -135,17 +162,26 @@
 
         <el-form-item prop="desc">
           <p class="formname">描述：</p>
-          <el-input type="textarea" v-model="form.desc"></el-input>
+          <el-input
+            type="textarea"
+            v-model="form.desc"
+          ></el-input>
         </el-form-item>
 
         <el-form-item prop="person">
           <p class="formname">登记人：</p>
-          <el-input v-model="form.person" disabled></el-input>
+          <el-input
+            v-model="form.person"
+            disabled
+          ></el-input>
         </el-form-item>
 
         <el-form-item prop="date">
           <p class="formname">登记日期：</p>
-          <el-input v-model="form.date" disabled></el-input>
+          <el-input
+            v-model="form.date"
+            disabled
+          ></el-input>
         </el-form-item>
 
         <el-form-item class="apaas_button">
@@ -153,12 +189,17 @@
             @click="resetForm('form')"
             class="left"
             v-if="$route.name == 'usersadd'"
-            >重置</el-button
-          >
-          <el-button type="primary" v-if="now_user==2" @click="onSubmit('form')" class="right"
-            >保存</el-button
-          >
-          <el-button class="right" @click="backPage">取消</el-button>
+          >重置</el-button>
+          <el-button
+            type="primary"
+            v-if="now_user==2"
+            @click="onSubmit('form')"
+            class="right"
+          >保存</el-button>
+          <el-button
+            class="right"
+            @click="backPage"
+          >取消</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -186,7 +227,8 @@ export default {
       });
     };
     var check_email = (rule, value, callback) => {
-      var email_ruler = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+      var email_ruler =
+        /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
       setTimeout(() => {
         if (value && !email_ruler.test(value)) {
           callback(new Error("请输入正确邮箱地址"));
@@ -196,7 +238,8 @@ export default {
       });
     };
     var checkip = (rule, value, callback) => {
-      var reg = /(((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3});/g;
+      var reg =
+        /(((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3});/g;
       setTimeout(() => {
         if (!reg.test(value)) {
           callback(new Error("请使用;隔开ip地址"));
@@ -273,7 +316,7 @@ export default {
           { required: true, message: "请输入账号", trigger: "blur" },
           { max: 16, message: "长度请不大于16个字符", trigger: "blur" },
           { min: 3, message: "长度请不小于3个字符", trigger: "blur" },
-          { validator: user_name_pass, trigger: "blur" }
+          { validator: user_name_pass, trigger: "blur" },
         ],
         password: [
           { required: true, message: "请输入密码", trigger: "blur" },
@@ -460,7 +503,7 @@ export default {
             // this.$message.error("获取组织失败");
           }
         })
-        .catch(function(response) {
+        .catch(function (response) {
           // this.$message.error("获取组织失败");
         });
     },
@@ -479,14 +522,14 @@ export default {
         user_id: this.form.account, // 用户名
         password: this.form.password,
         user_name: this.form.nickname, // 昵称
-        system_name: this.form.type>=2?this.form.systemname:'', //系统名称
+        system_name: this.form.type >= 2 ? this.form.systemname : "", //系统名称
         phone: this.form.phone + "", // 电话号
         email: this.form.email, // 邮箱
-        department_id: this.form.type>=2?this.form.origin:'', // 组织id
+        department_id: this.form.type >= 2 ? this.form.origin : "", // 组织id
         is_admin: this.form.type,
         state: this.form.able, // 用户状态，1——启用，0 禁用
-        domain_name: this.form.type>=3?this.form.domain:'', //
-        ip_whitelist: this.form.type>=3?this.form.ip:[], //
+        domain_name: this.form.type >= 3 ? this.form.domain : "", //
+        ip_whitelist: this.form.type >= 3 ? this.form.ip : [], //
         description: this.form.desc, //描述
         link_man: this.form.contact,
       };
@@ -509,14 +552,19 @@ export default {
       var temp = {
         user_id: this.form.account, // 用户名
         user_name: this.form.nickname, // 昵称
-        system_name: this.form.type>=2?this.form.systemname:'', //系统名称
+        system_name: this.form.type >= 2 ? this.form.systemname : "", //系统名称
         phone: this.form.phone + "", // 电话号
         email: this.form.email, // 邮箱
-        department_id: this.form.type>=2?this.form.origin:'', // 组织id
+        department_id: this.form.type >= 2 ? this.form.origin : "", // 组织id
         is_admin: this.form.type,
         state: this.form.able, // 用户状态，1——启用，0 禁用
-        domain_name: this.form.type>=3?this.form.domain:'', //
-        ip_whitelist: this.form.type>=3?this.form.ip && this.form.ip.length ? this.form.ip : []:[], //
+        domain_name: this.form.type >= 3 ? this.form.domain : "", //
+        ip_whitelist:
+          this.form.type >= 3
+            ? this.form.ip && this.form.ip.length
+              ? this.form.ip
+              : []
+            : [], //
         description: this.form.desc, //描述
         link_man: this.form.contact,
       };
@@ -541,7 +589,7 @@ export default {
     },
     onSubmit(formName) {
       console.log("submit!");
-      this.$refs[formName].validate((valid) => {
+      this.$refs[formName].validate((valid, err) => {
         if (valid) {
           if (this.edit_flag == 0) {
             this.check_user().then((res) => {
@@ -556,6 +604,7 @@ export default {
             this.set_user();
           }
         } else {
+          console.log(err);
           console.log("error submit!!");
           return false;
         }

src/pages/service_shop/services_shop.vue

 <template>
   <div class="services_shop-container">
     <div class="services_shop-carousel">
-      <el-carousel height="400px" arrow="never">
+      <el-carousel
+        height="400px"
+        arrow="never"
+      >
         <el-carousel-item
           v-for="(banner, index) in banners"
           :key="'banner_' + index"
         >
-          <img :src="banner.image_url" width="100%" @click="goto(banner.url)" />
+          <img
+            :src="banner.image_url"
+            width="100%"
+            @click="goto(banner.url)"
+          />
         </el-carousel-item>
       </el-carousel>
       <ul class="services_shop-info">
         <template v-for="(item, index) in servicesShopInfo">
-          <li class="info_item" :key="'info_' + index">
+          <li
+            class="info_item"
+            :key="'info_' + index"
+          >
             <div class="left-contianer">
-              <img :src="item.icon" width="100%" />
+              <img
+                :src="item.icon"
+                width="100%"
+              />
             </div>
             <div class="right-container">
               <p v-text="item.name"></p>
@@ -32,35 +45,15 @@
       </ul>
     </div>
 
-    <!-- 热门数据 -->
+    <!-- 热门服务 -->
     <shop-list
-      name="热门数据"
+      name="热门服务"
       to="/shop/data_service_list/5"
       detail-path="/shop/sjfwDetail/"
       :data="hot_datas"
       :showImg="false"
       :showSummary="true"
     ></shop-list>
-
-    <!-- 精品地图 -->
-    <shop-list
-      name="精品地图"
-      to="/shop/space_time_service_list/6"
-      detail-path="/shop/skfwDetail/"
-      :data="map_datas"
-      :showImg="true"
-      :showSummary="false"
-    ></shop-list>
-
-    <!-- 融合服务 -->
-    <shop-list
-      name="融合服务"
-      to="/shop/comprehensive_app_list/21"
-      detail-path="/shop/zhfwDetail/"
-      :data="comprehensive_datas"
-      :showImg="true"
-      :showSummary="false"
-    ></shop-list>
   </div>
 </template>
 
@@ -116,10 +109,6 @@ export default {
       this.$api.serviceShop.getFeaturedList({ type }).then((response) => {
         if (type == "hotdata") {
           this.hot_datas = response.data.data;
-        } else if (type == "hgmap") {
-          this.map_datas = response.data.data;
-        } else if (type == "zhapp") {
-          this.comprehensive_datas = response.data.data;
         }
       });
     },
@@ -150,8 +139,6 @@ export default {
   mounted() {
     this.getBenner();
     this.init("hotdata");
-    this.init("hgmap");
-    this.init("zhapp");
     this.getGeneralOverview();
   },
 };

src/pages/service_shop/shop_list-new.vue

@@ -44,50 +44,50 @@ export default {
           this.name = "基础支撑服务";
           this.urlFilter = "5";
           this.url = "/shop/sjfwDetail";
-          this.filterNames = ["基础支撑服务类型", "服务领域", "数据来源机构"];
+          this.filterNames = ["服务类型", "业务领域", "服务发布单位"];
           break;
         case "space_time_service_list":
           this.name = "基础地图服务";
           this.urlFilter = "6";
           this.url = "/shop/skfwDetail";
-          this.filterNames = ["基础地图服务类型", "服务领域", "服务来源组织"];
+          this.filterNames = ["服务类型", "业务领域", "服务发布单位"];
           break;
         case "video_service_list":
           this.name = "视频图像服务";
           this.urlFilter = "7";
           this.url = "/shop/spfwDetail";
-          this.filterNames = ["", "服务领域", "服务来源组织"];
-          break;
-        case "perception_service_list":
-          this.name = "感知服务";
-          this.urlFilter = "10";
-          this.url = "/shop/gzfwDetail";
-          this.filterNames = ["", "服务领域", "服务来源组织"];
+          this.filterNames = ["", "业务领域", "服务发布单位"];
           break;
+        // case "perception_service_list":
+        //   this.name = "感知服务";
+        //   this.urlFilter = "10";
+        //   this.url = "/shop/gzfwDetail";
+        //   this.filterNames = ["", "服务领域", "服务来源组织"];
+        //   break;
         case "comprehensive_app_list":
           this.name = "执法办案服务";
           this.urlFilter = "21";
           this.url = "/shop/zhfwDetail";
-          this.filterNames = ["服务类型", "服务领域", "服务来源组织"];
-          break;
-        case "app_store_list":
-          this.name = "应用商店";
-          this.urlFilter = "app";
-          this.url = "/shop/yysdDetail";
-          this.filterNames = ["应用类型", "应用领域", "应用来源机构"];
-          break;
-        case "products_list":
-          this.name = "产品资源";
-          this.urlFilter = "36";
-          this.url = "/shop/cpDetail";
-          this.filterNames = ["产品类型", "产品领域", "产品来源组织"];
-          break;
-        default:
-          this.name = "";
-          this.urlFilter = "";
-          this.url = "";
-          this.filterNames = [];
+          this.filterNames = ["服务类型", "业务领域", "服务发布单位"];
           break;
+        // case "app_store_list":
+        //   this.name = "应用商店";
+        //   this.urlFilter = "app";
+        //   this.url = "/shop/yysdDetail";
+        //   this.filterNames = ["应用类型", "应用领域", "应用来源机构"];
+        //   break;
+        // case "products_list":
+        //   this.name = "产品资源";
+        //   this.urlFilter = "36";
+        //   this.url = "/shop/cpDetail";
+        //   this.filterNames = ["产品类型", "产品领域", "产品来源组织"];
+        //   break;
+        // default:
+        //   this.name = "";
+        //   this.urlFilter = "";
+        //   this.url = "";
+        //   this.filterNames = [];
+        //   break;
       }
     },
   },

src/pages/service_shop/shopping_cart.vue

 <template>
   <div class="shopping">
-    <div class="shopping_title">我的购物车</div>
+    <div class="shopping_title">我的申请</div>
     <ShoppingCart />
   </div>
 </template>
@@ -10,13 +10,13 @@ import ShoppingCart from "@/components/shopping-cart/shopping-cart-com";
 
 export default {
   components: {
-    ShoppingCart
+    ShoppingCart,
   },
   data: () => ({
-    datas: {}
+    datas: {},
   }),
   mounted() {},
-  methods: {}
+  methods: {},
 };
 </script>
 <style scoped>