Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

src/main/java/com/izouma/nineth/utils/ImageUtils.java

@@ -27,8 +27,7 @@ public class ImageUtils {
                 .outputFormat("png")
                 .asBufferedImage();
         bufferedImage.flush();
-        PngQuant pngQuant = new PngQuant();
-        return pngQuant.getRemapped(img);
+        return img;
     }
 
     public static void main(String[] args) throws IOException {

src/main/pc-space/src/components/AddressInfo.vue

@@ -66,7 +66,9 @@ export default {
         onSubmit() {},
         init(row) {
             console.log(row);
-            this.sizeForm = row;
+            if (row.id) {
+                this.sizeForm = row;
+            }
         }
     }
 };

src/main/pc-space/src/views/user/AccountData.vue

@@ -6,20 +6,20 @@
             <div class="box">
                 <div class="text">
                     <div class="text1">
-                        <span class="el-icon-user"></span>
+                        <img class="icon" src="../../assets/user/fenxiang-icon@3x (1).png" alt="" />
                     </div>
                     <div class="text2">昵称</div>
-                    <div class="text3">{{ userInfo.username }}</div>
+                    <!-- <div class="text3">{{ userInfo.username }}</div> -->
                 </div>
                 <div class="text4">修改</div>
             </div>
             <div class="box">
                 <div class="text">
                     <div class="text1">
-                        <span class="el-icon-price-tag"></span>
+                        <img class="icon" src="../../assets/user/fenxiang-icon@3x (2).png" alt="" />
                     </div>
                     <div class="text2">编码</div>
-                    <div class="text3">{{ userInfo.id }}</div>
+                    <!-- <div class="text3">{{ userInfo.id }}</div> -->
                 </div>
                 <div class="text4">修改</div>
             </div>
@@ -41,7 +41,7 @@
                         <span class="el-icon-message"></span>
                     </div>
                     <div class="text2">邮箱</div>
-                    <div class="text3">{{ userInfo.email || '暂无' }}</div>
+                    <!-- <div class="text3">{{ userInfo.email || '暂无' }}</div> -->
                 </div>
                 <div class="text4">修改</div>
             </div>
@@ -53,7 +53,7 @@
                         <span class="el-icon-mobile-phone"></span>
                     </div>
                     <div class="text2">登录账号</div>
-                    <div class="text3">{{ Phone }}</div>
+                    <!-- <div class="text3">{{ Phone }}</div> -->
                 </div>
                 <div class="text4" @click="all('security')">修改</div>
             </div>
@@ -82,10 +82,10 @@
             <div class="box">
                 <div class="text">
                     <div class="text1">
-                        <span class="el-icon-lock"></span>
+                        <img class="icon" src="../../assets/user/icon-renzheng@3x.png" alt="" />
                     </div>
                     <div class="text2">实名认证</div>
-                    <div class="text3">{{ Status }}</div>
+                    <!-- <div class="text3">{{ Status }}</div> -->
                 </div>
                 <div class="text4" @click="Auths">修改</div>
             </div>
@@ -167,6 +167,10 @@ export default {
                 .text1 {
                     font-size: 24px;
                     color: #939599;
+                    .icon {
+                        width: 24px;
+                        height: 24px;
+                    }
                 }
                 .text2 {
                     font-size: 17px;
@@ -174,7 +178,7 @@ export default {
                     color: #ffffff;
                     line-height: 24px;
                     width: 94px;
-                    margin: 2px 0 0 10px;
+                    margin: 1px 0 0 10px;
                 }
                 .text3 {
                     font-size: 16px;

src/main/pc-space/src/views/user/Address.vue

@@ -2,7 +2,7 @@
     <div class="container">
         <div class="top">
             <div class="text1">已保存3条了条地址，还能保存7条地址</div>
-            <div class="text2" @click="add">新增地址</div>
+            <div class="text2" @click="add"><span class="el-icon-plus"></span>新增地址</div>
         </div>
         <div class="border"></div>
         <template>
@@ -20,8 +20,10 @@
                 <el-table-column prop="address" label="详情地址" width="220"> </el-table-column>
                 <el-table-column fixed="right" label="操作" width="100">
                     <template slot-scope="scope">
-                        <el-button @click="handleClick(scope.row)" type="text" size="small">修改</el-button>
-                        <el-button type="text" size="small">删除</el-button>
+                        <el-button style="color: #fdfb60" @click="handleClick(scope.row)" type="text" size="small"
+                            >修改</el-button
+                        >
+                        <el-button style="color: red" type="text" size="small">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -39,6 +41,7 @@ export default {
             show: false,
             tableData: [
                 {
+                    id: 1104,
                     name: '王小虎',
                     phone: '1774639714',
                     region: '江苏省南京市建邺区',
@@ -95,6 +98,12 @@ export default {
             color: #939599;
             cursor: pointer;
         }
+        span {
+            width: 26px !important;
+            height: 26px !important;
+            // font-size: 16px;
+            color: #939599;
+        }
     }
     .border {
         height: 1px;
@@ -112,11 +121,11 @@ export default {
 .customer-table th.is-leaf {
     border: none;
 }
-// 表格最外边框
-// .el-table--border,
-// .el-table--group {
-//     border: none;
-// }
+//表格最外边框
+.el-table--border,
+.el-table--group {
+    border: none;
+}
 // 头部边框
 .customer-table thead tr th.is-leaf {
     border: 1px solid #ebeef5;
@@ -137,9 +146,9 @@ export default {
 .el-table__fixed::before {
     width: 0;
 }
-// 表格有滚动时表格头边框
-// .el-table--border th.gutter:last-of-type {
-//     border: 1px solid #ebeef5;
-//     border-left: none;
-// }
+//表格有滚动时表格头边框
+.el-table--border th.gutter:last-of-type {
+    border: 1px solid #ebeef5;
+    border-left: none;
+}
 </style>

src/main/pc-space/src/views/user/Authentication.vue

@@ -1,16 +1,16 @@
 <template>
     <div class="container center-content">
         <div class="title">认证信息</div>
-        <div class="name">认证信息暂不允许修改，且无法替换认证类型，请谨慎选择</div>
+        <div class="name">认证信息暂<span>不允许修改</span>，且无法替换认证类型，请谨慎选择</div>
         <div class="box">
             <div class="box1">
-                <img class="img" src="../../assets/renzheng-icon-geren@3x.png" alt="" />
+                <img class="img" src="../../assets/user/renzheng-icon-geren@3x.png" alt="" />
                 <div class="text1">个人认证</div>
                 <div class="text2">个人通过实名认证后，绑定相对应银 行卡即可进行交易售卖</div>
                 <el-button @click="all('/userauthentication')">个人认证</el-button>
             </div>
             <div class="box1">
-                <img class="img" src="../../assets/renzheng-icon-qiye@3x.png" alt="" />
+                <img class="img" src="../../assets/user/renzheng-icon-qiye@3x.png" alt="" />
                 <div class="text1">企业认证</div>
                 <div class="text2">企业通过营业执照认证后，并签署 相应合同即可进行售卖，冰箱周部 分定制化服务</div>
                 <el-button @click="all('/enterpriseauthentication')">企业认证</el-button>
@@ -62,6 +62,9 @@ export default {
         line-height: 22px;
         margin: 10px 0 40px;
     }
+    span {
+        color: #fdfb60;
+    }
     .box {
         display: flex;
         margin-left: 178px;

src/main/pc-space/src/views/user/EnterpriseAuthentication.vue

@@ -5,7 +5,7 @@
             <div class="name">企业认证 <span>账户实名认证后不能修改</span></div>
             <div class="border"></div>
             <div class="fail" v-if="userInfo.authStatus === 'PENDING' || userInfo.authStatus === 'FAIL'">
-                <img class="text1" src="../../assets/icon-xiugaichengg@3x.png" alt="" />
+                <img class="text1" src="../../assets/user/icon-xiugaichengg@3x (1).png" alt="" />
                 <div class="text2">已提交企业认证</div>
                 <div class="text3">等待后台审核信息，预计1-3个工作日内完成</div>
                 <div class="botn" @click="Jump">返回</div>

src/main/pc-space/src/views/user/Give.vue

@@ -4,7 +4,6 @@
             <el-radio-group class="menu" v-model="type" size="normal">
                 <el-radio-button v-for="(item, index) in typeList" :key="index" :label="item.value">
                     <div class="radio-item">
-                        <!-- <i class="font_family" :class="[item.icon]"></i> -->
                         <span>{{ item.label }}</span>
                     </div>
                 </el-radio-button>
@@ -238,7 +237,6 @@ export default {
         width: 140px;
     }
     .el-radio-button__orig-radio:checked + .el-radio-button__inner {
-        // background: linear-gradient(41deg, #fdfb60 0%, #ff8f3e 100%);
         background: linear-gradient(46deg, @prim 0%, @warn 100%);
         color: #fff;
         border-color: #fff;
@@ -259,11 +257,12 @@ export default {
 
 .list {
     margin: -16px -16px;
-    min-height: 800px;
-    display: flex;
-    // justify-content: space-between;
+    min-height: 400px;
     .content {
-        margin: 16px;
+        margin: 23px;
+    }
+    .collect {
+        margin: 23px;
     }
 }
 

src/main/pc-space/src/views/user/Personal.vue

@@ -7,11 +7,11 @@
                 router
                 class="el-menu-vertical-demo"
                 text-color="#939599"
-                active-text-color="@prim"
+                active-text-color="#fdfb60"
             >
                 <el-submenu index="1">
                     <template slot="title">
-                        <i class="el-icon-location"></i>
+                        <img class="icon" src="../../assets/user/icon_yonghuxinxi@3x.png" alt="" />
                         <span>用户信息</span>
                     </template>
                     <el-menu-item index="/accountdata">资料与账号</el-menu-item>
@@ -20,13 +20,13 @@
                 </el-submenu>
                 <el-submenu index="2">
                     <template slot="title">
-                        <i class="el-icon-menu"></i>
+                        <img class="icon" src="../../assets/user/icon_jiaoyixinxi@3x.png" alt="" />
                         <span>交易信息</span>
                     </template>
                 </el-submenu>
                 <el-submenu index="3">
                     <template slot="title">
-                        <i class="el-icon-menu"></i>
+                        <img class="icon" src="../../assets/user/gongxu_icon_xuqiuxinxi@3x.png" alt="" />
                         <span>铸造信息</span>
                     </template>
                 </el-submenu>
@@ -63,16 +63,22 @@ export default {
             background: #1c1e26 !important;
             color: #ffffff !important;
             font-size: 18px !important;
-            padding-left: 10px !important;
+            padding-left: 24px !important;
         }
         .el-menu-item {
             background: #1c1e26 !important;
+            margin-left: 18px !important;
             span {
                 color: #ffffff !important;
                 font-size: 18px !important;
             }
         }
     }
+    .icon {
+        width: 24px;
+        height: 24px;
+        margin-right: 10px;
+    }
     .title {
         height: 42px;
         font-size: 32px;

src/main/pc-space/src/views/user/Security.vue

@@ -27,7 +27,7 @@
                         <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入4位验证码">
                             <span
                                 @click="send"
-                                style="color: @prim; cursor: pointer; font-size: 13px"
+                                style="color: #fdfb60; cursor: pointer; font-size: 13px"
                                 slot="suffix"
                                 >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
                             >
@@ -128,6 +128,12 @@ export default {
     font-weight: 400;
     color: #939599;
 }
+/deep/ .el-step__title.is-finish {
+    color: #fdfb60;
+}
+/deep/ .el-step__head.is-finish {
+    border-color: #fdfb60;
+}
 /deep/ .el-step__title.is-wait {
     color: #939599;
 }

src/main/pc-space/src/views/user/SecuritySuccess.vue

@@ -14,7 +14,7 @@
                     <el-step title="完成"></el-step>
                 </el-steps>
                 <div class="fail">
-                    <img class="text1" src="../../assets/icon-xiugaichengg@3x.png" alt="" />
+                    <img class="text1" src="../../assets/user/icon-xiugaichengg@3x (1).png" alt="" />
                     <div class="text2">修改成功，下次登录请使用新账号！</div>
                     <div class="botn" @click="Login">重新登录</div>
                 </div>
@@ -44,6 +44,12 @@ export default {
 /deep/ .el-steps {
     margin-left: 329px;
 }
+/deep/ .el-step__title.is-finish {
+    color: #fdfb60;
+}
+/deep/ .el-step__head.is-finish {
+    border-color: #fdfb60;
+}
 /deep/.el-step:nth-child(1) {
     .el-step__icon {
         background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);

src/main/pc-space/src/views/user/Transaction.vue

@@ -21,13 +21,13 @@
                     :rules="rules"
                 >
                     <el-form-item label="当前手机号" prop="phone">
-                        <div class="phone">{{ Phone }}</div>
+                        <!-- <div class="phone">{{ Phone }}</div> -->
                     </el-form-item>
                     <el-form-item label="验证码" prop="code">
                         <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入4位验证码">
                             <span
                                 @click="send"
-                                style="color: @prim; cursor: pointer; font-size: 13px"
+                                style="color: #fdfb60; cursor: pointer; font-size: 13px"
                                 slot="suffix"
                                 >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
                             >
@@ -131,6 +131,12 @@ export default {
 /deep/ .el-step__title.is-wait {
     color: #939599;
 }
+/deep/ .el-step__title.is-finish {
+    color: #fdfb60;
+}
+/deep/ .el-step__head.is-finish {
+    border-color: #fdfb60;
+}
 .container {
     .btn1 {
         margin-left: 10px;

src/main/pc-space/src/views/user/TransactionSuccess.vue

@@ -14,7 +14,7 @@
                     <el-step title="完成"></el-step>
                 </el-steps>
                 <div class="fail">
-                    <img class="text1" src="../../assets/icon-xiugaichengg@3x.png" alt="" />
+                    <img class="text1" src="../../assets/user/icon-xiugaichengg@3x (1).png" alt="" />
                     <div class="text2">修改成功，下次登录请使用新账号！</div>
                     <div class="botn" @click="Login">重新登录</div>
                 </div>
@@ -44,6 +44,12 @@ export default {
 /deep/ .el-steps {
     margin-left: 329px;
 }
+/deep/ .el-step__title.is-finish {
+    color: #fdfb60;
+}
+/deep/ .el-step__head.is-finish {
+    border-color: #fdfb60;
+}
 /deep/.el-step:nth-child(1) {
     .el-step__icon {
         background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);

src/main/pc-space/src/views/user/UserAuthentication.vue

@@ -5,7 +5,7 @@
             <div class="name">个人认证 <span>账户实名认证后不能修改</span></div>
             <div class="border"></div>
             <div class="fail" v-if="userInfo.authStatus === 'PENDING' || userInfo.authStatus === 'FAIL'">
-                <img class="text1" src="../../assets/icon-xiugaichengg@3x.png" alt="" />
+                <img class="text1" src="../../assets/user/icon-xiugaichengg@3x (1).png" alt="" />
                 <div class="text2">已提交个人认证</div>
                 <div class="text3">等待后台审核信息，预计1-3个工作日内完成</div>
                 <div class="botn" @click="Jump">返回</div>