Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-ui-new into dev

src/assets/css/index.css

@@ -190,8 +190,12 @@ div{
 .el-dialog{
   border-radius: 10px;
 }
+.el-dialog__header {
+  border-bottom: 1px solid #edf0ff;
+}
 .el-dialog__title{
   font-size: 16px;
+  font-weight: 700;
   color: #1d1e20;
   border-left: 4px solid #0367f6;
   padding-left: 8px;
@@ -499,6 +503,7 @@ width: 620px!important;
 /* 应用超市详情页公共样式 */
 .sevice_detail {
   max-width: 1200px;
+  padding-top: 1px;
   margin: 0 auto;
 }
 
@@ -535,6 +540,11 @@ width: 620px!important;
   background-color: #e1e4fb;
   border-color: #e1e4fb;
 }
+.apass_button .el-button.is-disabled, 
+.apass_button .el-button.is-disabled:focus, 
+.apass_button .el-button.is-disabled:hover {
+  cursor: not-allowed;
+}
 .apass_table .el-table th > .cell {
   color: #1a2236;
 }

src/components/apass-table.vue

 <template>
   <div class="apass_table">
     <el-table :data="data">
-      <el-table-column :width="paddingLeft - 10"></el-table-column>
+      <el-table-column :width="Math.max(paddingLeft - 10, 0)"></el-table-column>
       <el-table-column
         v-for="(item, index) in header"
         :label="item.label"

src/components/cropper.vue

@@ -31,7 +31,7 @@
       :close-on-click-modal="false"
       class="cropper_dia"
     >
-      <div style="width； 100%">
+      <div style="width: 100%">
         <div class="cropper_container">
           <!-- 裁剪 -->
           <div class="croppers">
@@ -54,8 +54,8 @@
           </div>
         </div>
         <el-row class="footerBtn" align="center">
-          <el-button type="primary" class="form_t" size="small" @click="cut('blob')">确&nbsp;&nbsp;认</el-button>
           <el-button type="primary" class="form_c" size="small" @click="handleClose">取&nbsp;&nbsp;消</el-button>
+          <el-button type="primary" class="form_t" size="small" @click="cut('blob')">确&nbsp;&nbsp;认</el-button>
         </el-row>
       </div>
     </el-dialog>
@@ -66,7 +66,7 @@
 import { VueCropper } from "vue-cropper";
 export default {
   components: {
-    VueCropper
+    VueCropper,
   },
   props: {
     fileArray: {
@@ -93,7 +93,7 @@ export default {
         canMoveBox: true, //截图框不能拖动
         autoCropWidth: 200, //截图框宽度
         autoCropHeight: 200, //截图框高度
-        centerBox: false //截图框被限制在图片里面
+        centerBox: false, //截图框被限制在图片里面
       },
       previews: {}, //实时预览图数据
       attach: {
@@ -101,10 +101,10 @@ export default {
         userId: "",
         customaryUrl: "", //原图片路径
         laterUrl: "", //裁剪后图片路径
-        attachType: "photo" //附件类型
+        attachType: "photo", //附件类型
       },
       fileName: "", //本机文件地址
-      uploadImgRelaPath: "" //上传后图片地址
+      uploadImgRelaPath: "", //上传后图片地址
     };
   },
   methods: {
@@ -119,7 +119,7 @@ export default {
     //加载图片信息
     find() {
       this.userId = sessionStorage.getItem("userId");
-      this.$http.post("ssapi", this.attach).then(res => {
+      this.$http.post("ssapi", this.attach).then((res) => {
         console.log(res);
       });
     },
@@ -134,7 +134,7 @@ export default {
       //fileReader 接口，用于异步读取文件数据
       var reader = new FileReader();
       reader.readAsDataURL(file); //重要 以dataURL形式读取文件
-      reader.onload = e => {
+      reader.onload = (e) => {
         // data = window.URL.createObjectURL(new Blob([e.target.result])) 转化为blob格式
 
         let data = e.target.result;
@@ -149,25 +149,23 @@ export default {
     //确认截图,上传
     cut(type) {
       var formData = new FormData();
-      this.$refs.cropper.getCropBlob(res => {
+      this.$refs.cropper.getCropBlob((res) => {
         //res是裁剪后图片的bolb对象
         formData.append("file", res, this.userId);
         formData.append("directory", "image");
         let url = "/awecloud/static/image/upload";
         this.$http
           .post(url, formData, {
-            contentType: false,
-            processData: false,
-            headers: { "Content-Type": "multipart/form-data" }
+            headers: { "Content-Type": "multipart/form-data" },
           })
-          .then(res => {
+          .then((res) => {
             // 上传图片后服务器返回访问路径
             this.$emit("getNewUrl", res.data.data);
             this.handleClose();
           });
       });
-    }
-  }
+    },
+  },
 };
 </script>
 

src/pages/service_shop/sjfwDetail.vue

@@ -42,27 +42,19 @@ export default {
     },
   },
   methods: {
-    getDataFromApi(_url) {
-      return new Promise((resolve, reject) => {
+    init() {
       this.$http
-          .get(_url)
+        .get("/apaas/serviceapp/v3/servicemarket/detail", {
+          params: {
+            serviceId: 666,
+          },
+        })
         .then((response) => {
-            resolve(response.body);
+          console.log(response.data);
         })
         .catch(function(error) {
-            reject(error);
-          });
-      });
-    },
-    init() {
-      this.getDataFromApi(`/static/serviceBaseInfo.json`).then(
-        ({ sjfw }) => {
-          this.baseInfo = sjfw;
-        },
-        (error) => {
           console.log(error);
-        }
-      );
+        });
     },
   },
   mounted() {

src/pages/user/user_info.vue

@@ -10,19 +10,20 @@
         <el-tab-pane label="业务系统详情" name="1"></el-tab-pane>
       </el-tabs>
       <el-form ref="form" :model="form">
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>账号：</p>
           <el-input v-model="form.accountNo"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item info_item_right_btn">
           <p>密码：</p>
           <el-input v-model="form.password"></el-input>
+          <el-button class="option_btn" @click="changePassword">修改密码</el-button>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>昵称：</p>
           <el-input v-model="form.nickname"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>头像：</p>
           <upload-file
             :multiple="false"
@@ -33,27 +34,59 @@
             @getNewList="getNewList"
           ></upload-file>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>联系人：</p>
           <el-input v-model="form.contactPerson"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>手机号：</p>
           <el-input v-model="form.phone"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>邮箱：</p>
           <el-input v-model="form.email"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>组织机构：</p>
           <el-input v-model="form.organization"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item info_item_right_btn">
           <p>当前角色：</p>
           <el-input v-model="form.role"></el-input>
+          <el-button class="option_btn" @click="upLevel">升级为开发者</el-button>
         </el-form-item>
       </el-form>
+      <div class="btn_footer">
+        <el-button class="previous" @click="previous">取消</el-button>
+        <el-button class="registe" @click="registe">修改</el-button>
+      </div>
+      <el-dialog
+        title="修改密码"
+        :visible.sync="diaPassWord"
+        width="440px"
+        :modal-append-to-body="false"
+      >
+        <div class="change_psw">
+          <el-form ref="form" :model="form">
+            <el-form-item class="dia_item">
+              <p>旧密码：</p>
+              <el-input v-model="form.accountNo"></el-input>
+            </el-form-item>
+            <el-form-item class="dia_item">
+              <p>新密码：</p>
+              <el-input v-model="form.password"></el-input>
+            </el-form-item>
+            <el-form-item class="dia_item">
+              <p>请再次输入密码：</p>
+              <el-input v-model="form.nickname"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="dia_btn_footer">
+          <el-button class="previous" @click="cancelChangePwd">取消</el-button>
+          <el-button class="registe" @click="submitChangePwd">修改</el-button>
+        </div>
+      </el-dialog>
     </block-radius>
   </div>
 </template>
@@ -78,21 +111,102 @@ export default {
       organization: "",
       role: ""
     },
-    imgList: []
+    imgList: [],
+    diaPassWord: false
   }),
   mounted() {
-    this.imgList.push("https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg")
+    this.imgList.push(
+      "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+    );
   },
   methods: {
     changeTab() {},
     getNewList(val) {
       console.log(val);
+    },
+    previous() {},
+    registe() {},
+    changePassword() {
+      this.diaPassWord = true;
+    },
+    cancelChangePwd() {
+      this.diaPassWord = false;
+    },
+    submitChangePwd() {},
+    upLevel() {
+      this.diaPassWord = true;
     }
   }
 };
 </script>
 <style scoped>
 .info_block {
-  margin: 0 20px;
+  margin: 0 20px 20px;
+  position: relative;
+}
+.btn_footer {
+  display: flex;
+  justify-content: flex-end;
+  margin: 40px 20px 10px;
+}
+.previous {
+  width: 100px;
+  background-color: #c3caf8;
+  color: #0f2683;
+}
+.registe {
+  width: 100px;
+  background-color: #0f2683;
+  color: #f8f9fd;
+}
+.option_btn {
+  width: 124px;
+  background-color: #495feb;
+  border-radius: 8px;
+  color: #f8f9fd;
+}
+.info_item {
+  width: 70%;
+  min-width: 600px;
+  max-width: 1200px;
+  margin-bottom: 12px;
+}
+.info_item p {
+  padding-left: 15px;
+  color: #242c43;
+}
+.change_psw {
+  text-align: left;
+}
+.dia_item {
+  width: 100%;
+  margin-bottom: 12px;
+}
+.dia_item p {
+  padding-left: 15px;
+  color: #242c43;
+}
+.dia_btn_footer {
+  display: flex;
+  justify-content: flex-end;
+  margin: 20px 0 0;
+}
+</style>
+<style>
+.info_item_right_btn .el-input {
+  width: calc(100% - 140px);
+  margin-right: 10px;
+}
+.info_block .el-dialog__wrapper {
+  padding-left: 180px;
+}
+.info_block .v-modal {
+  position: absolute;
+  border-radius: 8px;
+  width: 100%;
+  height: 100%;
+}
+.info_block .el-dialog__body {
+  padding: 15px 20px 20px;
 }
 </style>
\ No newline at end of file

src/pages/workbench/fwgl/fwglList.vue

@@ -36,98 +36,7 @@ export default {
     type: 0, // 访问的页面
     listTotal: 0,
     listHeader: [],
-    listData: [
-      {
-        id: 1000001,
-        img:
-          "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-        name: "贵阳市公安局",
-        system_count: 6,
-        organization_manager: 3,
-        time: "2019-04-11 12:50:30",
-      },
-      {
-        id: 1000002,
-        img:
-          "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-        name: "语音识别",
-        system_count: 6,
-        organization_manager: 3,
-        time: "2019-04-11 12:50:30",
-      },
-      {
-        id: 1000003,
-        img:
-          "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-        name: "轨迹绘制",
-        system_count: 6,
-        organization_manager: 3,
-        time: "2019-04-11 12:50:30",
-      },
-      {
-        id: 1000004,
-        img:
-          "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-        name: "轨迹绘制",
-        system_count: 6,
-        organization_manager: 3,
-        time: "2019-04-11 12:50:30",
-      },
-      {
-        id: 1000005,
-        img:
-          "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-        name: "轨迹绘制",
-        system_count: 6,
-        organization_manager: 3,
-        time: "2019-04-11 12:50:30",
-      },
-      {
-        id: 1000006,
-        img:
-          "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-        name: "轨迹绘制",
-        system_count: 6,
-        organization_manager: 3,
-        time: "2019-04-11 12:50:30",
-      },
-      {
-        id: 1000007,
-        img:
-          "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-        name: "轨迹绘制",
-        system_count: 6,
-        organization_manager: 3,
-        time: "2019-04-11 12:50:30",
-      },
-      {
-        id: 100000,
-        img:
-          "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-        name: "轨迹绘制",
-        system_count: 6,
-        organization_manager: 3,
-        time: "2019-04-11 12:50:30",
-      },
-      {
-        id: 1000009,
-        img:
-          "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-        name: "轨迹绘制",
-        system_count: 6,
-        organization_manager: 3,
-        time: "2019-04-11 12:50:30",
-      },
-      {
-        id: 1000010,
-        img:
-          "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-        name: "轨迹绘制",
-        system_count: 6,
-        organization_manager: 3,
-        time: "2019-04-11 12:50:30",
-      },
-    ],
+    listData: [],
     filterList: [
       {
         name: "服务类型",

src/request/http.js

@@ -18,12 +18,7 @@ const tip = msg => {
  * 登录用 bg-login ，具体链接晚几天加
  */
 const toLogin = () => {
-    router.replace({
-        path: '/login',
-        query: {
-            redirect: router.currentRoute.fullPath
-        }
-    });
+    window.location.href = "/login?redirect=" + router.currentRoute.fullPath
 }
 
 /**